[bug 874286] Switch to query parser