diff --git a/torchci/components/benchmark/llms/components/LLMsGraphPanel.tsx b/torchci/components/benchmark/llms/components/LLMsGraphPanel.tsx
index 614d820723..28180a3e3e 100644
--- a/torchci/components/benchmark/llms/components/LLMsGraphPanel.tsx
+++ b/torchci/components/benchmark/llms/components/LLMsGraphPanel.tsx
@@ -4,6 +4,7 @@ import {
   WORKFLOW_ID_TO_COMMIT,
 } from "components/benchmark/BranchAndCommitPicker";
 import { TIME_FIELD_NAME } from "components/benchmark/common";
+import _ from "lodash";
 
 import {
   Granularity,
@@ -151,26 +152,7 @@ export default function LLMsGraphPanel({
 
               if (repoName === "vllm-project/vllm") {
                 let requestRate = record.extra!["request_rate"];
-                // TODO (huydhn): Fix the invalid JSON on vLLM side
-                if (
-                  metric.includes("itl") ||
-                  metric.includes("tpot") ||
-                  metric.includes("ttft")
-                ) {
-                  requestRate = requestRate !== "" ? requestRate : "Inf";
-                }
-
                 let tensorParallel = record.extra!["tensor_parallel_size"];
-                // TODO (huydhn): Fix the passing of tensor_parallel_size to the benchmark
-                // script on vLLM side
-                if (model.includes("8B")) {
-                  tensorParallel = tensorParallel !== "" ? tensorParallel : "1";
-                } else if (model.includes("70B")) {
-                  tensorParallel = tensorParallel !== "" ? tensorParallel : "4";
-                } else if (model.includes("8x7B")) {
-                  tensorParallel = tensorParallel !== "" ? tensorParallel : "2";
-                }
-
                 if (requestRate !== "") {
                   record.display = `${model} / tp${tensorParallel} / qps_${requestRate}`;
                 } else {
@@ -207,9 +189,17 @@ export default function LLMsGraphPanel({
     );
   });
 
-  const availableMetric =
-    metricNames.find((metric) => chartData[metric].length !== 0) ??
-    metricNames[0];
+  // This is the detail table below the charts
+  const tableData: { [k: string]: any } = {};
+  Object.keys(chartData).forEach((metric: string) => {
+    chartData[metric].forEach((data: LLMsBenchmarkData) => {
+      const commit = WORKFLOW_ID_TO_COMMIT[data.workflow_id];
+      if (!(commit in tableData)) {
+        tableData[commit] = [];
+      }
+      tableData[commit].push(data);
+    });
+  });
 
   return (
     <>
@@ -262,19 +252,19 @@ export default function LLMsGraphPanel({
                   <th key={metric}>
                     {chartData[metric].length !== 0
                       ? metric in METRIC_DISPLAY_SHORT_HEADERS
-                        ? METRIC_DISPLAY_SHORT_HEADERS[metric]
-                        : metric
+                        ? `${METRIC_DISPLAY_SHORT_HEADERS[metric]} |`
+                        : `${metric} |`
                       : ""}
                   </th>
                 ))}
               </tr>
             </thead>
             <tbody>
-              {chartData[availableMetric].map((entry: any, index: number) => {
-                let commit = WORKFLOW_ID_TO_COMMIT[entry.workflow_id];
+              {Object.keys(tableData).map((commit: string) => {
+                const commitData = tableData[commit];
                 return (
-                  <tr key={index}>
-                    <td>{entry.granularity_bucket}</td>
+                  <tr key={commit}>
+                    <td>{commitData[0].granularity_bucket}</td>
                     <td>
                       <code>
                         <a
@@ -288,9 +278,18 @@ export default function LLMsGraphPanel({
                     {metricNames
                       .filter((metric) => chartData[metric].length !== 0)
                       .map((metric: string) => (
-                        <td key={`${metric}-${index}`}>
-                          {chartData[metric][index] !== undefined
-                            ? chartData[metric][index].actual
+                        <td key={`${metric}-${commit}`}>
+                          {commitData.filter(
+                            (data: LLMsBenchmarkData) => data.metric === metric
+                          ).length !== 0
+                            ? _.mean(
+                                commitData
+                                  .filter(
+                                    (data: LLMsBenchmarkData) =>
+                                      data.metric === metric
+                                  )
+                                  .map((data: LLMsBenchmarkData) => data.actual)
+                              ).toFixed(2)
                             : ""}
                         </td>
                       ))}
diff --git a/torchci/lib/benchmark/llms/utils/llmUtils.ts b/torchci/lib/benchmark/llms/utils/llmUtils.ts
index b8ebc04b47..74ae7664b7 100644
--- a/torchci/lib/benchmark/llms/utils/llmUtils.ts
+++ b/torchci/lib/benchmark/llms/utils/llmUtils.ts
@@ -238,36 +238,6 @@ export function combineLeftAndRight(
       if (repoName === "vllm-project/vllm") {
         // These fields are only available on vLLM benchmark
         const extraInfo = JSON.parse(extra);
-        // TODO (huydhn): Fix the invalid JSON on vLLM side
-        if (
-          metric.includes("itl") ||
-          metric.includes("tpot") ||
-          metric.includes("ttft")
-        ) {
-          extraInfo["request_rate"] =
-            extraInfo["request_rate"] !== ""
-              ? extraInfo["request_rate"]
-              : "Inf";
-        }
-        // TODO (huydhn): Fix the passing of tensor_parallel_size to the benchmark
-        // script on vLLM side
-        if (model.includes("8B")) {
-          extraInfo["tensor_parallel_size"] =
-            extraInfo["tensor_parallel_size"] !== ""
-              ? extraInfo["tensor_parallel_size"]
-              : 1;
-        } else if (model.includes("70B")) {
-          extraInfo["tensor_parallel_size"] =
-            extraInfo["tensor_parallel_size"] !== ""
-              ? extraInfo["tensor_parallel_size"]
-              : 4;
-        } else if (model.includes("8x7B")) {
-          extraInfo["tensor_parallel_size"] =
-            extraInfo["tensor_parallel_size"] !== ""
-              ? extraInfo["tensor_parallel_size"]
-              : 2;
-        }
-
         row["extra"] = extraInfo;
         row["tensor_parallel_size"] = extraInfo["tensor_parallel_size"];
         row["request_rate"] = extraInfo["request_rate"];