Fix monthly and weekly ETags so they don't repeat each year

Currently, the weekly and monthly ETags will repeat after a year, which could cause problems. So I've added the year to make them more specific.

(I should have noticed this when I made the previous tweak!)