diff --git a/public/app/partials/metrics.html b/public/app/partials/metrics.html
index 2556466ba17..db304d1c232 100644
--- a/public/app/partials/metrics.html
+++ b/public/app/partials/metrics.html
@@ -7,7 +7,7 @@
 		Add query
 	</button>
 
-  <div class="pull-right" style="margin-right: 10px;">
+  <div class="pull-right dropdown" style="margin-right: 10px;">
 		<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" bs-tooltip="'Datasource'">
 			<i class="fa fa-database"></i>&nbsp;
 			{{datasource.name}} <span class="caret"></span>
diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js
index af613ad5e43..e8eaefda61a 100644
--- a/public/app/plugins/datasource/influxdb/queryBuilder.js
+++ b/public/app/plugins/datasource/influxdb/queryBuilder.js
@@ -32,12 +32,10 @@ function (_) {
     }
 
     query +=  aggregationFunc + '(value)';
-    query += ' FROM ' + measurement + ' WHERE ';
+    query += ' FROM ' + measurement + ' WHERE $timeFilter';
     query += _.map(target.tags, function(value, key) {
-      return key + ' = ' + "'" + value + "' AND ";
-    });
-
-    query += '$timeFilter';
+      return ' AND ' + key + '=' + "'" + value + "'";
+    }).join('');
 
     query += ' GROUP BY time($interval)';
 
diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js
index 8082e2b72f3..09fb343171a 100644
--- a/public/test/specs/influx09-querybuilder-specs.js
+++ b/public/test/specs/influx09-querybuilder-specs.js
@@ -27,8 +27,8 @@ define([
       var query = builder.build();
 
       it('should generate correct query', function() {
-        expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname = \'server1\'' +
-          ' AND $timeFilter GROUP BY time($interval) ORDER BY asc');
+        expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE $timeFilter ' +
+          'AND hostname=\'server1\' GROUP BY time($interval) ORDER BY asc');
       });
 
     });