Tweak the filtering