[WIP] #3527 Improving Elasticsearch extension
[WIP] #3527 Fixing spaces