Jira issue SCHOOLBR-48, More little bugs