fixed issue with group field names not matching the group's enumeration