And updating the search form to suit