diff --git a/src/hooks/data.ts b/src/hooks/data.ts
index f683cf8e..73eef8d1 100644
--- a/src/hooks/data.ts
+++ b/src/hooks/data.ts
@@ -32,7 +32,7 @@ export enum Calculations {
   Precision = "precision",
   ConvertSeconds = "convertSeconds",
   ConvertMilliseconds = "convertMilliseconds",
-  MsTos = "msTos",
+  MsToS = "msTos",
   Average = "average",
   PercentageAvg = "percentageAvg",
   ApdexAvg = "apdexAvg",
diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts
index ae9d914b..c764d42e 100644
--- a/src/hooks/useProcessor.ts
+++ b/src/hooks/useProcessor.ts
@@ -383,19 +383,16 @@ export function aggregation(
     case Calculations.Apdex:
       data = val / 10000;
       break;
-    case Calculations.ApdexAvg:
-      data = val / 10000;
-      break;
     case Calculations.ConvertSeconds:
-      data = dayjs(val).format("YYYY-MM-DD HH:mm:ss");
+      data = dayjs(val * 1000).format("YYYY-MM-DD HH:mm:ss");
       break;
     case Calculations.ConvertMilliseconds:
-      data = dayjs.unix(val).format("YYYY-MM-DD HH:mm:ss");
+      data = dayjs(val).format("YYYY-MM-DD HH:mm:ss");
       break;
     case Calculations.Precision:
       data = data.toFixed(2);
       break;
-    case Calculations.MsTos:
+    case Calculations.MsToS:
       data = (val / 1000).toFixed(2);
       break;
     case Calculations.SecondToDay: