diff --git a/dashboards/postgresql-database.json b/dashboards/postgresql-database.json
index 56b026b..ca96097 100644
--- a/dashboards/postgresql-database.json
+++ b/dashboards/postgresql-database.json
@@ -1410,7 +1410,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "pg_settings_seq_page_cost",
+          "expr": "pg_settings_seq_page_cost{instance=\"$instance\"}",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -3021,6 +3021,7 @@
       },
       {
         "allValue": null,
+        "description": "Namespace where PostgreSQL exporter deployed",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
         "definition": "",
@@ -3045,6 +3046,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
+        "description": "Name of PostgreSQL Exporter deployment",
         "definition": "",
         "hide": 0,
         "includeAll": false,
@@ -3068,6 +3070,7 @@
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
         "definition": "",
+        "description": "PostgreSQL exporter instance",
         "hide": 0,
         "includeAll": false,
         "label": "Instance",
@@ -3090,13 +3093,14 @@
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
         "definition": "",
+        "description": "Exported database name",
         "hide": 0,
         "includeAll": true,
         "label": "Database",
         "multi": true,
         "name": "datname",
         "options": [],
-        "query": "label_values(datname)",
+        "query": "label_values({instance=\"$instance\",release=\"$release\"},datname)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -3118,7 +3122,7 @@
         "multi": true,
         "name": "mode",
         "options": [],
-        "query": "label_values({mode=~\"accessexclusivelock|accesssharelock|exclusivelock|rowexclusivelock|rowsharelock|sharelock|sharerowexclusivelock|shareupdateexclusivelock\"}, mode)",
+        "query": "label_values({instance=\"$instance\",release=\"$release\",mode=~\"accessexclusivelock|accesssharelock|exclusivelock|rowexclusivelock|rowsharelock|sharelock|sharerowexclusivelock|shareupdateexclusivelock\"}, mode)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -3162,6 +3166,6 @@
   },
   "timezone": "",
   "title": "PostgreSQL Database",
-  "uid": "000000039",
-  "version": 1
+  "uid": "000000040",
+  "version": 2
 }