Fix grouping grid