improve search (added form)