diff --git a/schemas/bgp.yml b/schemas/bgp.yml
index 741bdeb..8946b84 100644
--- a/schemas/bgp.yml
+++ b/schemas/bgp.yml
@@ -3,9 +3,9 @@
 ---
 version: "1.0"
 nodes:
-  # ==========================================================================
+  # ===================================================================
   # Autonomous System
-  # ==========================================================================
+  # ===================================================================
   - name: AutonomousSystem
     namespace: Infra
     description: BGP Autonomous System
@@ -15,7 +15,7 @@ nodes:
       - asn__value
     order_by:
       - asn__value
-    display_label: "asn__value"
+    display_label: "{{ asn__value }}"
     attributes:
       - name: asn
         kind: Number
@@ -33,9 +33,9 @@ nodes:
           - name: public
             label: Public
 
-  # ==========================================================================
+  # ===================================================================
   # BGP Router Configuration (per device)
-  # ==========================================================================
+  # ===================================================================
   - name: BGPRouterConfig
     namespace: Infra
     description: BGP router configuration on a device
@@ -43,7 +43,7 @@ nodes:
     icon: mdi--router-wireless
     human_friendly_id:
       - device__name__value
-    display_label: "router_id__value"
+    display_label: "{{ router_id__value }}"
     attributes:
       - name: router_id
         kind: IPHost
@@ -81,9 +81,9 @@ nodes:
         cardinality: many
         kind: Component
 
-  # ==========================================================================
+  # ===================================================================
   # BGP Peer Group
-  # ==========================================================================
+  # ===================================================================
   - name: BGPPeerGroup
     namespace: Infra
     description: BGP peer group template
@@ -91,7 +91,7 @@ nodes:
     icon: mdi--account-group
     human_friendly_id:
       - name__value
-    display_label: "name__value"
+    display_label: "{{ name__value }}"
     attributes:
       - name: name
         kind: Text
@@ -153,9 +153,9 @@ nodes:
         cardinality: one
         optional: true
 
-  # ==========================================================================
+  # ===================================================================
   # BGP Session (Neighbor)
-  # ==========================================================================
+  # ===================================================================
   - name: BGPSession
     namespace: Infra
     description: BGP neighbor session
@@ -163,7 +163,7 @@ nodes:
     icon: mdi--connection
     human_friendly_id:
       - peer_address__value
-    display_label: "peer_address__value"
+    display_label: "{{ peer_address__value }}"
     attributes:
       - name: peer_address
         kind: IPHost
@@ -195,15 +195,15 @@ nodes:
         optional: true
         description: Remote peer device (for documentation)
 
-  # ==========================================================================
+  # ===================================================================
   # BGP Address Family Configuration
-  # ==========================================================================
+  # ===================================================================
   - name: BGPAddressFamily
     namespace: Infra
     description: BGP address family configuration
     label: BGP Address Family
     icon: mdi--format-list-bulleted
-    display_label: "afi__value"
+    display_label: "{{ afi__value }}"
     attributes:
       - name: afi
         kind: Dropdown