Various changes for search page