[bug 986589] Switch queries to use simple-query-string