search form rework