Fix field names for metric_id