diff --git a/ReportingServices.Shared.Blazor/Repositories/Implementations/ScrapeDatabaseRepository.cs b/ReportingServices.Shared.Blazor/Repositories/Implementations/ScrapeDatabaseRepository.cs
index 38fd067..74442c4 100644
--- a/ReportingServices.Shared.Blazor/Repositories/Implementations/ScrapeDatabaseRepository.cs
+++ b/ReportingServices.Shared.Blazor/Repositories/Implementations/ScrapeDatabaseRepository.cs
@@ -488,7 +488,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
         string query = "SELECT TOP 1 DATEDIFF(MINUTE,STOP_DTM,SYSDATETIME()) " +
                        "  FROM REACT_MODE " +
                        " WHERE REACT_NO = @reactorNumber " +
-                       "   AND (MODE = 'UP' OR MODE = 'UP_WITH_INCREASED_SAMPLING') " +
+                       "   AND (MODE = 'UP' OR MODE LIKE '%UP_WITH_INCREASED_SAMPLING%') " +
                        "ORDER BY START_DTM DESC";
 
         cmd.CommandText = query;
diff --git a/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs b/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs
index d5ec51a..1fdab6a 100644
--- a/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs
+++ b/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs
@@ -540,7 +540,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
         string query = "SELECT TOP 1 DATEDIFF(MINUTE,STOP_DTM,SYSDATETIME()) " +
                        "  FROM REACT_MODE " +
                        " WHERE REACT_NO = @reactorNumber " +
-                       "   AND (MODE = 'UP' OR MODE = 'UP_WITH_INCREASED_SAMPLING') " +
+                       "   AND (MODE = 'UP' OR MODE LIKE '%UP_WITH_INCREASED_SAMPLING%') " +
                        "ORDER BY START_DTM DESC";
 
         cmd.CommandText = query;
diff --git a/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs b/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs
index 3f72404..64e67b0 100644
--- a/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs
+++ b/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs
@@ -162,7 +162,7 @@ public class ToolEventView
         if (evnt.ToUpper() == "UP")
             return true;
 
-        if (evnt.ToUpper() == "UP_WITH_INCREASED_SAMPLING")
+        if (evnt.ToUpper().Contains("UP_WITH_INCREASED_SAMPLING"))
             return true;
 
         if (evnt.ToUpper() == "IDLE")
@@ -174,9 +174,6 @@ public class ToolEventView
         if (evnt.ToUpper() == "WAITING_FOR_ENGINEER_SCHEDULED")
             return true;
 
-        if (evnt.ToUpper() == "UP_WITH_INCREASED_SAMPLING_SURFACE")
-            return true;
-
         return false;
     }
 
diff --git a/ReportingServices.UI/wwwroot/Assets/SLLTools.json b/ReportingServices.UI/wwwroot/Assets/SLLTools.json
index 3e73561..a7096f1 100644
--- a/ReportingServices.UI/wwwroot/Assets/SLLTools.json
+++ b/ReportingServices.UI/wwwroot/Assets/SLLTools.json
@@ -1 +1 @@
-[{"Date":"2023-01-23T00:00:00-07:00","ASM":7,"HTR":16},{"Date":"2023-01-24T00:00:00-07:00","ASM":7,"HTR":15},{"Date":"2023-01-26T00:00:00-07:00","ASM":7,"HTR":14},{"Date":"2023-02-20T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-01T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-03T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-04-03T00:00:00-07:00","ASM":2,"HTR":6}]
\ No newline at end of file
+[{"Date":"2023-01-23T00:00:00-07:00","ASM":7,"HTR":16},{"Date":"2023-01-24T00:00:00-07:00","ASM":7,"HTR":15},{"Date":"2023-01-26T00:00:00-07:00","ASM":7,"HTR":14},{"Date":"2023-02-20T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-01T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-03T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-04-03T00:00:00-07:00","ASM":2,"HTR":6},{"Date":"2023-05-25T00:00:00-07:00","ASM":2,"HTR":8}]
\ No newline at end of file
diff --git a/ReportingServices.UI/wwwroot/Assets/ToolStates.json b/ReportingServices.UI/wwwroot/Assets/ToolStates.json
index 503357e..1c44614 100644
--- a/ReportingServices.UI/wwwroot/Assets/ToolStates.json
+++ b/ReportingServices.UI/wwwroot/Assets/ToolStates.json
@@ -35,6 +35,8 @@
     "UP_WITH_RESTRICTIONS",
     "UP",
     "UP_WITH_INCREASED_SAMPLING",
+    "UP_WITH_INCREASED_SAMPLING_SURFACE",
+    "UP_WITH_INCREASED_SAMPLING_METROLOGY",
     "UP_NOT_RUNNING",
     "TROUBLESHOOT_OPERATOR",
     "IDLE",