Fix filter checks