Enhance Elasticsearch check while updating