Improving escaping of match queries for newer extended query features