Move more String types to Text types

No match.