Enhance Elasticsearch check