Improve logic for cohort visibility labels

TNL-25
I do think that it should be in the front end, and I'm not sure we'll have another good opportunity in this epic to make that change.