diff --git a/grafana/dashboards/spotisights-admin/spotify-insights-all-users.json b/grafana/dashboards/spotisights-admin/spotify-insights-all-users.json
index bbfbdea..354ba14 100644
--- a/grafana/dashboards/spotisights-admin/spotify-insights-all-users.json
+++ b/grafana/dashboards/spotisights-admin/spotify-insights-all-users.json
@@ -22,7 +22,7 @@
     "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
-    "iteration": 1646411549896,
+    "iteration": 1653581109794,
     "links": [],
     "liveNow": false,
     "panels": [
@@ -2618,33 +2618,17 @@
                         ]
                     }
                 },
-                {
-                    "id": "calculateField",
-                    "options": {
-                        "alias": "track, artist",
-                        "mode": "reduceRow",
-                        "reduce": {
-                            "include": [
-                                "track",
-                                "artists"
-                            ],
-                            "reducer": "allValues"
-                        },
-                        "replaceFields": false
-                    }
-                },
                 {
                     "id": "organize",
                     "options": {
                         "excludeByName": {
-                            "artists": true,
-                            "track": true
+                            "artists": false,
+                            "track": false
                         },
                         "indexByName": {
-                            "artists": 1,
-                            "duration_ms (count)": 3,
-                            "track": 0,
-                            "track, artist": 2
+                            "artists": 0,
+                            "duration_ms (count)": 2,
+                            "track": 1
                         },
                         "renameByName": {
                             "artists": "",
@@ -2910,6 +2894,6 @@
     "timezone": "",
     "title": "All Users",
     "uid": "spotisights-admin",
-    "version": 20,
+    "version": 21,
     "weekStart": ""
 }
diff --git a/grafana/dashboards/spotisights/spotify-insights-current-user.json b/grafana/dashboards/spotisights/spotify-insights-current-user.json
index 94a4d28..49b4d39 100644
--- a/grafana/dashboards/spotisights/spotify-insights-current-user.json
+++ b/grafana/dashboards/spotisights/spotify-insights-current-user.json
@@ -22,7 +22,7 @@
     "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
-    "iteration": 1646413551100,
+    "iteration": 1653580999242,
     "links": [],
     "liveNow": false,
     "panels": [
@@ -2618,33 +2618,17 @@
                         ]
                     }
                 },
-                {
-                    "id": "calculateField",
-                    "options": {
-                        "alias": "track, artist",
-                        "mode": "reduceRow",
-                        "reduce": {
-                            "include": [
-                                "track",
-                                "artists"
-                            ],
-                            "reducer": "allValues"
-                        },
-                        "replaceFields": false
-                    }
-                },
                 {
                     "id": "organize",
                     "options": {
                         "excludeByName": {
-                            "artists": true,
-                            "track": true
+                            "artists": false,
+                            "track": false
                         },
                         "indexByName": {
-                            "artists": 1,
-                            "duration_ms (count)": 3,
-                            "track": 0,
-                            "track, artist": 2
+                            "artists": 0,
+                            "duration_ms (count)": 2,
+                            "track": 1
                         },
                         "renameByName": {
                             "artists": "",
@@ -2905,6 +2889,6 @@
     "timezone": "",
     "title": "Current User",
     "uid": "spotisights",
-    "version": 9,
+    "version": 14,
     "weekStart": ""
 }