close #161 refactor search form views