Improve logic for cohort visibility labels

TNL-25
is not None (0 may be a valid group_id)