Fix Elasticsearch query runner error: 'str' object has no attribute 'pop' error when parsing query#6941