diff --git a/schemas/vrf.yml b/schemas/vrf.yml
index 19c64bb..1010596 100644
--- a/schemas/vrf.yml
+++ b/schemas/vrf.yml
@@ -3,15 +3,16 @@
 ---
 version: "1.0"
 nodes:
-  # =============================================================================
+  # ==========================================================================
   # VRF (Virtual Routing and Forwarding)
-  # =============================================================================
+  # ==========================================================================
   - name: VRF
     namespace: Infra
     description: Virtual Routing and Forwarding instance
     label: VRF
     icon: mdi--router
-    default_filter: name__value
+    human_friendly_id:
+      - name__value
     order_by:
       - name__value
     display_labels:
@@ -55,15 +56,16 @@ nodes:
         optional: true
         description: Interfaces assigned to this VRF
 
-  # =============================================================================
+  # ==========================================================================
   # Route Target
-  # =============================================================================
+  # ==========================================================================
   - name: RouteTarget
     namespace: Infra
     description: BGP Route Target for VPN import/export
     label: Route Target
     icon: mdi--target
-    default_filter: target__value
+    human_friendly_id:
+      - target__value
     order_by:
       - target__value
     display_labels:
@@ -77,17 +79,19 @@ nodes:
         kind: Text
         optional: true
 
-  # =============================================================================
+  # ==========================================================================
   # VRF Device Assignment
-  # =============================================================================
+  # ==========================================================================
   - name: VRFDeviceAssignment
     namespace: Infra
     description: VRF assignment to a specific device
     label: VRF Assignment
     icon: mdi--router-network
-    display_labels:
-      - vrf__name__value
+    human_friendly_id:
       - device__name__value
+      - vrf__name__value
+    display_labels:
+      - route_distinguisher__value
     attributes:
       - name: route_distinguisher
         kind: Text