Improve pagination/sort results