Improve logic for cohort visibility labels

TNL-25
Yes, I think that would be a better factoring.