add TODO, I need some configurable filters