Fix value choices in ComboEnumComponentBuilder