Modified method in module elastic_search
Merge branch 'origin/master'