fixed issue with metrics all coming through now - if there are none totals come through as 0 though - need to think about this