[NGRINDER-611] Fix sorting bugs