added support for empty query parameters