Refactoring metrics. Now 'last 12 months' values show correct values