Fix subject display when a ChoiceField is used