cleaned up search form