updated for the search page

Please review and merge