Clean up display text for choices fields