Rewrite parse_terms now we don't have complication of special-casing quo...

...ted query strings