[fix] Correctly include the querystring
[fix] Make sure we include the query object