Improvements to search form