More refactoring in custom fields for subgroups.