Improve logic for cohort visibility labels

TNL-25
This doesn't belong here