Metrics refactoring. Last-12-months values are correct now