what I mean is that the filtering logic needs to be adapted