Fix sorting bug
Enable grouping