first version of search filters
Merge branch 'search_filters'
Changes to Search Form