Improve orderBy results