Fixed: CustomFields with OptionGroups