Improve logic for cohort visibility labels

TNL-25
Or better yet, 'group_id' in thread