search form rework 3