Jira issue SCHOOLBR-47, deselect cohort - A better solution