Changes to Search function
Merge branch 'search-robs-branch'