Fixes to filters