filtering treatment factors
Reviewer: Dan Jao
merge with master