refactored for new search functionality
new search model
new search functionality