Tidy up search form