Fixing the filtering