attempt to fix the filtering