Added sort by semester