Respect TraitFilters

Change 1
Don't stash this, stash the data you're getting out of it.