More work on the search page