Added search and filter functionality.
Updated tests for new search/filter functionality. Todo: add new search/filter tests