Always correctly show sort order
Simplify sort method