Cleanup search.
Merge branch 'develop'