Fix marshalling of metrics resources; Still pending json as default