Use text_en instead of text_general for all text-y fields, which fixes the problems with inconsistent highlighting.