APD-67: No search results for certain queries
Merge branch 'develop' into feature/APD-62-merge-with-develop

Conflicts:
	web-app/js/objectTreeWrapper.js
APD-62: fix broken pagination.