add support for filter and apply