fix grid grouping