Improved auto-tagging of courses