Remove topicCategory handler from custom-fields
Use the right label for enumerations