Moved all Search filters to search page.  Additional refactoring