Standardizing on YEAR vs WEEK YEAR for everything but Weekly