Minor updates and fixes to search form