added support for query string parameters