Changed getting weeks to be explicitly ordered by weekNumber