added filtering for cohorts

Change-Id: I9e18f5da6c98f650562d224e4820bdeebdfddad9