Improve logic for cohort visibility labels

TNL-25