tidied up search form