Improved filter handling