TitledEnumLabel improvement