Fixed grouping and sorting