Add support for including the query string