Merge pull request 'Merge search behaviour change, and refactor elasticsearch' (...