changed name of search functions in templates
Merge branch 'develop'