Some more fixes with filters