[WIP] Main search form refactoring