Sort by calander week and BugFix