added support for FilterOnly