Elasticsearch Improvements (Duplicate)