search page fixes.
Merge branch '#31623_Sorting' into dev