back to single trait filtering until new branches drop

Change-Id: I187efdf6be7e854a11c630da05a0193086286995