diff --git a/ui/src/hosts/components/LayoutRenderer.js b/ui/src/hosts/components/LayoutRenderer.js
index 9cf1b65ae6..0412111490 100644
--- a/ui/src/hosts/components/LayoutRenderer.js
+++ b/ui/src/hosts/components/LayoutRenderer.js
@@ -45,12 +45,12 @@ export const LayoutRenderer = React.createClass({
     return this.props.cells.map((cell) => {
       const qs = cell.queries.map((q) => {
         _.merge(q, {host: source});
-        q.text += ` where host = '${host}' and time > ${timeRange}`;
+        q.text += ` where \"host\" = '${host}' and time > ${timeRange}`;
         if (q.wheres && q.wheres.length > 0) {
           q.text += ` and ${q.wheres.join(' and ')}`;
         }
         if (q.groupbys && q.groupbys.length > 0) {
-          q.text += ` group by ${q.groupBys.join(',')}`;
+          q.text += ` group by ${q.groupbys.join(',')}`;
         }
         return q;
       });