update query for Elasticsearch 7.x#474

inggilove wants to merge 3 commits intogetredash:mastergetredash/website:masterfrom

inggilove:patch-1inggilove/website:patch-1Copy head branch name to clipboard