diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js
index ce76e545743..a167abb81d6 100644
--- a/public/app/plugins/datasource/influxdb/queryBuilder.js
+++ b/public/app/plugins/datasource/influxdb/queryBuilder.js
@@ -15,9 +15,9 @@ function (_) {
     }
 
     if (tag.value && tag.value[0] === '/' && tag.value[tag.value.length - 1] === '/') {
-      return str + tag.key + ' =~ ' + tag.value;
+      return str + '"' +tag.key + '"' + ' =~ ' + tag.value;
     }
-    return str + tag.key + " = '" + tag.value + "'";
+    return str + '"' + tag.key + '"' + " = '" + tag.value + "'";
   }
 
   var p = InfluxQueryBuilder.prototype;
@@ -92,7 +92,7 @@ function (_) {
 
     query += ' GROUP BY time($interval)';
     if  (target.groupByTags && target.groupByTags.length > 0) {
-      query += ', ' + target.groupByTags.join();
+      query += ', "' + target.groupByTags.join('", "') + '"';
     }
 
     if (target.fill) {