Improve sort order