Fixed a bug with the sorting

Sorting with weeks and year is still not right though