Merge pull request #1954 from dennishendriksen/master

Batch retrieve search results from index
Elasticsearch batching fix