Add support for query param wrapping