Trying to fix grouping in the grid