Fix filter issues