improve search form