diff --git a/html/modules/custom/ghi_blocks/src/Traits/GlobalSettingsTrait.php b/html/modules/custom/ghi_blocks/src/Traits/GlobalSettingsTrait.php
index 8594f35e8..8fa902827 100644
--- a/html/modules/custom/ghi_blocks/src/Traits/GlobalSettingsTrait.php
+++ b/html/modules/custom/ghi_blocks/src/Traits/GlobalSettingsTrait.php
@@ -172,8 +172,10 @@ private function applyGlobalConfigurationTable(array &$header, array &$rows, arr
         if (!$plan || $plan instanceof PlanOverviewPlanMock) {
           return $row;
         }
-        $row['name']['data']['name']['#markup'] = $plan->getShortName();
-        $row['name']['data-value'] = $plan->getShortName();
+        $short_name = $plan->getShortName();
+        $row['name']['data']['name']['#markup'] = $short_name;
+        $row['name']['data-value'] = $short_name;
+        $row['name']['data-raw-value'] = $short_name;
         return $row;
       }, $rows);
     }