more fixes to the filter