diff --git a/views/nav_regions.sql b/views/nav_regions.sql
index 57b1ab8..770c3f0 100644
--- a/views/nav_regions.sql
+++ b/views/nav_regions.sql
@@ -13,7 +13,10 @@ SELECT
     --
     CASE WHEN r.icon_css_classes IS NOT NULL THEN app.get_icon(r.icon_css_classes) END AS region_icon,
     --
-    r.region_name,
+    CASE
+        WHEN r.template != 'Hero'
+            THEN REPLACE(RPAD(' ', 3), ' ', '&' || 'nbsp; ')
+            END || r.region_name AS region_name,
     --
     --r.parent_region_id,
     --r.source_type,
@@ -51,6 +54,7 @@ JOIN apex_application_pages p
     AND p.page_id               = r.page_id
 CROSS JOIN x
 WHERE r.application_id          = app.get_app_id()
+    AND r.parent_region_id      IS NULL
     AND (x.page_id              = p.page_id OR x.page_id IS NULL)
     AND (x.auth_scheme          = r.authorization_scheme OR x.auth_scheme IS NULL);
 
diff --git a/views/roles_auth_schemes.sql b/views/roles_auth_schemes.sql
index fa8ad6f..8081f9c 100644
--- a/views/roles_auth_schemes.sql
+++ b/views/roles_auth_schemes.sql
@@ -33,6 +33,7 @@ LEFT JOIN apex_application_pages p
 LEFT JOIN apex_application_page_regions g
     ON g.application_id                 = a.application_id
     AND g.authorization_scheme          = a.authorization_scheme_name
+    AND g.parent_region_id              IS NULL
 LEFT JOIN roles r
     ON r.role_id                        = a.authorization_scheme_name
 LEFT JOIN user_roles u