Fixes for ElasticSearch and better ElasticSearch support