diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 126f946a2d..e1db7b9512 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -1712,8 +1712,8 @@ ACTOR static Future<JsonBuilderObject> workloadStatusFetcher(Reference<AsyncVar<
 		double batchTpsLimit = batchRatekeeper.getDouble("TPSLimit");
 		double transPerSec = ratekeeper.getDouble("ReleasedTPS");
 		double batchTransPerSec = ratekeeper.getDouble("ReleasedBatchTPS");
-		int throttledTags = ratekeeper.getInt("TagsThrottled");
-		int batchThrottledTags = batchRatekeeper.getInt("TagsThrottled");
+		int autoThrottledTags = ratekeeper.getInt("TagsAutoThrottled");
+		int manualThrottledTags = ratekeeper.getInt("TagsManuallyThrottled");
 		int ssCount = ratekeeper.getInt("StorageServers");
 		int tlogCount = ratekeeper.getInt("TLogs");
 		int64_t worstFreeSpaceStorageServer = ratekeeper.getInt64("WorstFreeSpaceStorageServer");
@@ -1744,8 +1744,17 @@ ACTOR static Future<JsonBuilderObject> workloadStatusFetcher(Reference<AsyncVar<
 		(*qos)["batch_transactions_per_second_limit"] = batchTpsLimit;
 		(*qos)["released_transactions_per_second"] = transPerSec;
 		(*qos)["batch_released_transactions_per_second"] = batchTransPerSec;
-		(*qos)["tags_throttled"] = throttledTags;
-		(*qos)["batch_tags_throttled"] = batchThrottledTags;
+
+		JsonBuilderObject throttledTagsObj;
+		JsonBuilderObject autoThrottledTagsObj;
+		autoThrottledTagsObj["count"] = autoThrottledTags;
+		throttledTagsObj["auto"] = autoThrottledTagsObj;
+
+		JsonBuilderObject manualThrottledTagsObj;
+		manualThrottledTagsObj["count"] = manualThrottledTags;
+		throttledTagsObj["manual"] = manualThrottledTagsObj;
+
+		(*qos)["throttled_tags"] = throttledTagsObj;
 
 		JsonBuilderObject perfLimit = getPerfLimit(ratekeeper, transPerSec, tpsLimit);
 		if(!perfLimit.empty()) {