diff --git a/app/src/app/dashboard/statistical-variable-count-card.tsx b/app/src/app/dashboard/statistical-variable-count-card.tsx
index 11370b6a7..412773a71 100644
--- a/app/src/app/dashboard/statistical-variable-count-card.tsx
+++ b/app/src/app/dashboard/statistical-variable-count-card.tsx
@@ -6,7 +6,7 @@ export const StatisticalVariableCountCard = async () => {
   const client = await createSupabaseSSRClient();
 
   const { count, error } = await client
-    .from("stat_definition")
+    .from("stat_definition_active")
     .select("", { count: "exact" })
     .limit(0);
 
diff --git a/app/src/app/reports/ReportsPageClient.tsx b/app/src/app/reports/ReportsPageClient.tsx
index 245c43ed5..e10d80681 100644
--- a/app/src/app/reports/ReportsPageClient.tsx
+++ b/app/src/app/reports/ReportsPageClient.tsx
@@ -34,7 +34,7 @@ export default function ReportsPageClient({
       { value: "count", label: "Count", title: "Number of enterprises" },
       ...(statDefinitions.map(({ code, name }) => ({
         value: code!,
-        label: code!,
+        label: name!,
         title: name!,
       })) ?? []),
     ];
diff --git a/app/src/app/search/components/statistical-unit-table-header.tsx b/app/src/app/search/components/statistical-unit-table-header.tsx
index eedd5f54e..a3cecf8dd 100644
--- a/app/src/app/search/components/statistical-unit-table-header.tsx
+++ b/app/src/app/search/components/statistical-unit-table-header.tsx
@@ -29,7 +29,7 @@ export function StatisticalUnitTableHeader({
               return (
                 <SortableTableHead name="name" label="Name" key={`h-cell-${headerCellSuffix(column)}`}>
                   <small className="flex">
-                    {externalIdentTypes.map(({ code }) => code).join(" | ")}
+                    {externalIdentTypes.map(({ name }) => name).join(" | ")}
                   </small>
                 </SortableTableHead>
               );
@@ -92,7 +92,7 @@ export function StatisticalUnitTableHeader({
                     key={`h-cell-${headerCellSuffix(column)}`}
                     className="text-right hidden lg:table-cell [&>*]:capitalize"
                     name={statDefinition.code!}
-                    label={statDefinition.code!}
+                      label={statDefinition.name!}
                   />
                 );
               }
diff --git a/app/src/components/statistical-unit-hierarchy/topology-item.tsx b/app/src/components/statistical-unit-hierarchy/topology-item.tsx
index 170f79c7a..de7f2baf3 100644
--- a/app/src/components/statistical-unit-hierarchy/topology-item.tsx
+++ b/app/src/components/statistical-unit-hierarchy/topology-item.tsx
@@ -82,7 +82,7 @@ export function TopologyItem({
                   <TopologyItemInfo
                     key={statDefinition.id}
                     className="flex-1"
-                    title={statDefinition.code || ""}
+                    title={statDefinition.name!}
                     value={formattedValue}
                   />
                 );