CalculatedMetrics can now be safely serialised and still deliver the same results.
Fixes to controller & views.