Update - add check for course instance id in Coursemanager and add new message to template