Fixed summer term and sorting bugs