added a filter on search functionality
fixed issues: show only search/filtered results when coming back from detailed screen
Merge branch 'develop' into feature/load_specific_data_on_filter_or_search