Potential fix for ElasticSearch import issues

@RickCSong