Some tweaks to the search form