Fixing filter madness