Fix support for query parameters