added support for filter query