Bug Fix #380826: Fixed class order by ordering first by class name and then by curricular year.