diff --git a/schemas/bgp.yml b/schemas/bgp.yml
index 32e3b1a..87cd1fc 100644
--- a/schemas/bgp.yml
+++ b/schemas/bgp.yml
@@ -3,15 +3,16 @@
 ---
 version: "1.0"
 nodes:
-  # =============================================================================
+  # ==========================================================================
   # Autonomous System
-  # =============================================================================
+  # ==========================================================================
   - name: AutonomousSystem
     namespace: Infra
     description: BGP Autonomous System
     label: Autonomous System
     icon: mdi--cloud-outline
-    default_filter: asn__value
+    human_friendly_id:
+      - asn__value
     order_by:
       - asn__value
     display_labels:
@@ -34,16 +35,18 @@ nodes:
           - name: public
             label: Public
 
-  # =============================================================================
+  # ==========================================================================
   # BGP Router Configuration (per device)
-  # =============================================================================
+  # ==========================================================================
   - name: BGPRouterConfig
     namespace: Infra
     description: BGP router configuration on a device
     label: BGP Router Config
     icon: mdi--router-wireless
-    display_labels:
+    human_friendly_id:
       - device__name__value
+    display_labels:
+      - router_id__value
     attributes:
       - name: router_id
         kind: IPHost
@@ -80,15 +83,16 @@ nodes:
         cardinality: many
         kind: Component
 
-  # =============================================================================
+  # ==========================================================================
   # BGP Peer Group
-  # =============================================================================
+  # ==========================================================================
   - name: BGPPeerGroup
     namespace: Infra
     description: BGP peer group template
     label: BGP Peer Group
     icon: mdi--account-group
-    default_filter: name__value
+    human_friendly_id:
+      - name__value
     display_labels:
       - name__value
     attributes:
@@ -151,15 +155,16 @@ nodes:
         cardinality: one
         optional: true
 
-  # =============================================================================
+  # ==========================================================================
   # BGP Session (Neighbor)
-  # =============================================================================
+  # ==========================================================================
   - name: BGPSession
     namespace: Infra
     description: BGP neighbor session
     label: BGP Session
     icon: mdi--connection
-    default_filter: peer_address__value
+    human_friendly_id:
+      - peer_address__value
     display_labels:
       - peer_address__value
     attributes:
@@ -192,9 +197,9 @@ nodes:
         optional: true
         description: Remote peer device (for documentation)
 
-  # =============================================================================
+  # ==========================================================================
   # BGP Address Family Configuration
-  # =============================================================================
+  # ==========================================================================
   - name: BGPAddressFamily
     namespace: Infra
     description: BGP address family configuration