APD-645: Search bar improvements
Merge branch 'APD-645' into develop

Conflicts:
	web-app/js/index.js
	web-app/js/search/objectSearch.js