Added ability to match on query parameters