Add some filter checks