reorganized threads in ElasticSearch
merge changes