diff --git a/schemas/extensions.yml b/schemas/extensions.yml
index 07724bd..51d8ecd 100644
--- a/schemas/extensions.yml
+++ b/schemas/extensions.yml
@@ -3,15 +3,16 @@
 ---
 version: "1.0"
 nodes:
-  # =============================================================================
+  # ==========================================================================
   # Fabric (Top-level container for all fabric objects)
-  # =============================================================================
+  # ==========================================================================
   - name: Fabric
     namespace: Infra
     description: EVPN-VXLAN Fabric definition
     label: Fabric
     icon: mdi--vector-polygon
-    default_filter: name__value
+    human_friendly_id:
+      - name__value
     order_by:
       - name__value
     display_labels:
@@ -57,18 +58,20 @@ nodes:
         cardinality: many
         optional: true
 
-  # =============================================================================
+  # ==========================================================================
   # Underlay P2P Link
-  # =============================================================================
+  # ==========================================================================
   - name: UnderlayLink
     namespace: Infra
     description: Point-to-point underlay link between devices
     label: Underlay Link
     icon: mdi--cable-data
     display_labels:
-      - local_device__name__value
-      - remote_device__name__value
+      - description__value
     attributes:
+      - name: description
+        kind: Text
+        description: Link description (e.g., spine1:eth1 <-> leaf1:eth11)
       - name: local_ip
         kind: IPNetwork
         description: Local interface IP with mask
@@ -104,15 +107,16 @@ nodes:
         cardinality: one
         direction: outbound
 
-  # =============================================================================
+  # ==========================================================================
   # Host Connection
-  # =============================================================================
+  # ==========================================================================
   - name: HostConnection
     namespace: Infra
     description: Host connection to fabric (single or dual-homed)
     label: Host Connection
     icon: mdi--desktop-tower
-    default_filter: hostname__value
+    human_friendly_id:
+      - hostname__value
     display_labels:
       - hostname__value
     attributes: