Added support for filter queries