Respect TraitFilters

Change 1
Undo the change here