Rejigger search results and search form