Don't delete query values after formatting

They may be useful to other users of the query object
Merge pull request #509 from grncdr/dont-delete-query-values

Don't delete query values after formatting