search form cleanup