AT-7 and AT-8 changes to courseChooser.php