Fix order of metrics data for graphs