fix grouping for existing fields