Fixed grouping on reports