search form rework 2