Jira issue SCHOOLBR-45, edge case fixes + minor bugs