Added dynamic filter name plus a custom filter.