Fix filter regression