ElasticSearch performance improvements