``query`` does not seem to be used, so perhaps it could be removed, along with the ``querystring`` dependency?