Switch back to using the query-string parser

- Provides more flexible query power at the expense of forcing us to do additional escaping work