diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index 1a526637..60e10418 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -51,21 +51,22 @@ var MAX_INTERVAL_VALUE = 366;
 var BIN_MIN_NUMBER = 6;
 var BIN_MAX_NUMBER = 48;
 
-var filteredQueryTpl = dot.template([
-    '__cdb_filtered_source AS (',
-    '  SELECT *',
-    '  FROM ({{=it._query}}) __cdb_filtered_source_query',
-    '  WHERE',
-    '    {{=it._column}} IS NOT NULL',
-    '  {{?it._isFloatColumn}}AND',
-    '    {{=it._column}} != \'infinity\'::float',
-    '  AND',
-    '    {{=it._column}} != \'-infinity\'::float',
-    '  AND',
-    '    {{=it._column}} != \'NaN\'::float{{?}}',
-    ')'
-].join(' \n'));
-
+const filteredQueryTpl = ctx => `
+    __cdb_filtered_source AS (
+        SELECT *
+        FROM (${ctx._query}) __cdb_filtered_source_query
+        WHERE
+            ${ctx._column} IS NOT NULL
+        ${ctx._isFloatColumn ? `
+        AND
+            ${ctx._column} != 'infinity'::float
+        AND
+            ${ctx._column} != '-infinity'::float
+        AND
+            ${ctx._column} != 'NaN'::float
+        ` : ''}
+    )
+`
 var basicsQueryTpl = dot.template([
     '__cdb_basics AS (',
     '  SELECT',