Changes to grouping choices