fixing in 2 othe places, too
Merge branch 'elasticsearch'