diff --git a/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_prefix_hist.json b/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_prefix_hist.json
index 33edaf5..9669c93 100644
--- a/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_prefix_hist.json
+++ b/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_prefix_hist.json
@@ -645,27 +645,28 @@
         "type": "query"
       },
       {
+        "name": "rd",
+        "type": "query",
+        "label": "RD",
+        "description": "Route Distinguisher (VRF). Auto-discovered from l3vpn_rib; '-' = all VRFs.",
+        "datasource": {
+          "type": "postgres",
+          "uid": "obmp_postgres"
+        },
+        "query": "SELECT '-' AS rd UNION SELECT DISTINCT rd FROM l3vpn_rib WHERE iswithdrawn = false ORDER BY rd",
+        "definition": "SELECT '-' AS rd UNION SELECT DISTINCT rd FROM l3vpn_rib WHERE iswithdrawn = false ORDER BY rd",
+        "refresh": 1,
+        "includeAll": false,
+        "multi": false,
         "current": {
-          "selected": false,
+          "selected": true,
           "text": "-",
           "value": "-"
         },
-        "description": "RD in the format of N:N.  Set to - for all.",
+        "options": [],
+        "sort": 1,
         "hide": 0,
-        "includeAll": false,
-        "label": "RD",
-        "multi": false,
-        "name": "rd",
-        "options": [
-          {
-            "selected": true,
-            "text": "-",
-            "value": "-"
-          }
-        ],
-        "query": "-",
-        "skipUrlSync": false,
-        "type": "custom"
+        "skipUrlSync": false
       }
     ]
   },
@@ -703,4 +704,4 @@
   "uid": "l3vpn-prefix-hist",
   "version": 2,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_rib_browser.json b/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_rib_browser.json
index 25a44b2..b0666d2 100644
--- a/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_rib_browser.json
+++ b/obmp-grafana/dashboards/obmp/L3VPN-1005/l3vpn_rib_browser.json
@@ -1067,28 +1067,28 @@
         "useTags": false
       },
       {
+        "name": "rd",
+        "type": "query",
+        "label": "RD",
+        "description": "Route Distinguisher (VRF). Auto-discovered from l3vpn_rib; '-' = all VRFs.",
+        "datasource": {
+          "type": "postgres",
+          "uid": "obmp_postgres"
+        },
+        "query": "SELECT '-' AS rd UNION SELECT DISTINCT rd FROM l3vpn_rib WHERE iswithdrawn = false ORDER BY rd",
+        "definition": "SELECT '-' AS rd UNION SELECT DISTINCT rd FROM l3vpn_rib WHERE iswithdrawn = false ORDER BY rd",
+        "refresh": 1,
+        "includeAll": false,
+        "multi": false,
         "current": {
           "selected": true,
           "text": "-",
           "value": "-"
         },
-        "description": "RD in the format of N:N.  Set to - for all.",
+        "options": [],
+        "sort": 1,
         "hide": 0,
-        "includeAll": false,
-        "label": "RD",
-        "multi": false,
-        "name": "rd",
-        "options": [
-          {
-            "selected": true,
-            "text": "-",
-            "value": "-"
-          }
-        ],
-        "query": "-",
-        "queryValue": "203:20",
-        "skipUrlSync": false,
-        "type": "custom"
+        "skipUrlSync": false
       },
       {
         "current": {