Order before paginating
Merge branch 'search-results' into dev-hrishi