Change 'query' to accept QueryString and QueryParams.