Make org/course combinations unique again
John\'s changes to course frontend