wip improving search form