Added support for querystring filtering