bugfix, and cleanup

- Fixed a bug with persistent query parsing
- Fixed QUERY_STRING existent