Replaced courseid with courseshortname in results