Filter handling cleanups
6 files changed