Refactoring searches to be cleaner
Merge branch 'developing'