diff --git a/canned/nsq_topic.json b/canned/nsq_topic.json
index 42c4e1c962..b78bd96d4a 100644
--- a/canned/nsq_topic.json
+++ b/canned/nsq_topic.json
@@ -1,5 +1,5 @@
 {
-  "id": "7b035812-182a-4a94-ba2e-902dfb81e0a2",
+  "id": "912f337b-3af2-42af-9352-b31a5bc3b431",
   "measurement": "nsq_topic",
   "app": "nsq",
   "cells": [
@@ -27,7 +27,7 @@
       "y": 0,
       "w": 4,
       "h": 4,
-      "i": "e3eb48c0-8283-4445-b174-f4f8e4182e45",
+      "i": "912f337b-3af2-42af-9352-b31a5bc3b431",
       "name": "NSQ topic messages on disk",
       "queries": [
         {
diff --git a/canned/postgresql.json b/canned/postgresql.json
index 610bef76c7..621ac5f642 100644
--- a/canned/postgresql.json
+++ b/canned/postgresql.json
@@ -8,7 +8,6 @@
       "y": 0,
       "w": 12,
       "h": 4,
-      "i": "",
       "i": "b417bc9f-b16d-4691-91a7-85adfdd3e8ec",
       "name": "PostgreSQL Rows",
       "queries": [
diff --git a/canned/redis.json b/canned/redis.json
index f575fc05ab..7bf37158e4 100644
--- a/canned/redis.json
+++ b/canned/redis.json
@@ -1,64 +1,71 @@
- {
-    "id": "793e6cca-7d7f-48e4-8db2-7b81761cc6ff",
- 	"measurement": "redis_keyspace",
- 	"app": "redis",
- 	"cells": [{
- 		"x": 0,
- 		"y": 0,
- 		"w": 4,
- 		"h": 4,
-        "i": "9c168ac8-2985-4883-bdf2-938ea9f065b9",
-        "name": "Redis - Connected Clients",
- 		"queries": [{
- 			"query": "select clients from redis",
- 			"db": "telegraf",
- 			"rp": "autogen",
-  			"groupbys": []
-		}]
- 	},
+{
+  "id": "793e6cca-7d7f-48e4-8db2-7b81761cc6ff",
+  "measurement": "redis_keyspace",
+  "app": "redis",
+  "cells": [
     {
- 		"x": 0,
- 		"y": 0,
- 		"w": 4,
- 		"h": 4,
-        "i": "9c168ac8-2985-4883-bdf2-938ea9f065a0",
-        "name": "Redis - Blocked Clients",
- 		"queries": [{
- 			"query": "select blocked_clients from redis",
- 			"db": "telegraf",
- 			"rp": "autogen",
-  			"groupbys": []
-		}]
+      "x": 0,
+      "y": 0,
+      "w": 4,
+      "h": 4,
+      "i": "9c168ac8-2985-4883-bdf2-938ea9f065b9",
+      "name": "Redis - Connected Clients",
+      "queries": [
+        {
+          "query": "select clients from redis",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": []
+        }
+      ]
     },
     {
- 		"x": 0,
- 		"y": 0,
- 		"w": 4,
- 		"h": 4,
-        "i": "9c168ac8-2985-4883-bdf2-938ea9f065b1",
-        "name": "Redis - CPU",
- 		"queries": [{
- 			"query": "select non_negative_derivative(\"used_cpu_user\") as used_cpu_per_second from redis",
- 			"db": "telegraf",
- 			"rp": "autogen",
-  			"groupbys": [
-            ]
-		}]
+      "x": 0,
+      "y": 0,
+      "w": 4,
+      "h": 4,
+      "i": "9c168ac8-2985-4883-bdf2-938ea9f065a0",
+      "name": "Redis - Blocked Clients",
+      "queries": [
+        {
+          "query": "select blocked_clients from redis",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": []
+        }
+      ]
     },
     {
- 		"x": 0,
- 		"y": 0,
- 		"w": 4,
- 		"h": 4,
-        "i": "9c168ac8-2985-4883-bdf2-938ea9f065b2",
-        "name": "Redis - Memory",
- 		"queries": [{
- 			"query": "select non_negative_derivative(\"used_memory\") as used_memory_per_second from redis",
- 			"db": "telegraf",
- 			"rp": "autogen",
-  			"groupbys": [
-            ]
-		}]
+      "x": 0,
+      "y": 0,
+      "w": 4,
+      "h": 4,
+      "i": "9c168ac8-2985-4883-bdf2-938ea9f065b1",
+      "name": "Redis - CPU",
+      "queries": [
+        {
+          "query": "select non_negative_derivative(\"used_cpu_user\") as used_cpu_per_second from redis",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": []
+        }
+      ]
+    },
+    {
+      "x": 0,
+      "y": 0,
+      "w": 4,
+      "h": 4,
+      "i": "9c168ac8-2985-4883-bdf2-938ea9f065b2",
+      "name": "Redis - Memory",
+      "queries": [
+        {
+          "query": "select non_negative_derivative(\"used_memory\") as used_memory_per_second from redis",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": []
+        }
+      ]
     }
-    ]
- }
+  ]
+}