[Change] Various improvements to filters.