Proper year/week handling in the templates