diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index 54a9fcf6..629a69f7 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -52,9 +52,9 @@ var BIN_MIN_NUMBER = 6;
 var BIN_MAX_NUMBER = 48;
 
 var filteredQueryTpl = dot.template([
-    'filtered_source AS (',
+    '__cdb_filtered_source AS (',
     '  SELECT *',
-    '  FROM ({{=it._query}}) _cdb_filtered_source',
+    '  FROM ({{=it._query}}) _cdb_filtered_source_query',
     '  WHERE',
     '    {{=it._column}} IS NOT NULL',
     '  {{?it._isFloatColumn}}AND',
@@ -71,7 +71,7 @@ var basicsQueryTpl = dot.template([
     '  SELECT',
     '    max({{=it._column}}) AS max_val, min({{=it._column}}) AS min_val,',
     '    avg({{=it._column}}) AS avg_val, count(1) AS total_rows',
-    '  FROM filtered_source',
+    '  FROM __cdb_filtered_source',
     ')'
 ].join(' \n'));
 
@@ -80,7 +80,7 @@ var overrideBasicsQueryTpl = dot.template([
     '  SELECT',
     '    max({{=it._end}}) AS max_val, min({{=it._start}}) AS min_val,',
     '    avg({{=it._column}}) AS avg_val, count(1) AS total_rows',
-    '  FROM filtered_source',
+    '  FROM __cdb_filtered_source',
     ')'
 ].join('\n'));
 
@@ -91,7 +91,7 @@ var iqrQueryTpl = dot.template([
     '    SELECT quartile, max(_cdb_iqr_column) AS quartile_max from (',
     '      SELECT {{=it._column}} AS _cdb_iqr_column, ntile(4) over (order by {{=it._column}}',
     '    ) AS quartile',
-    '    FROM filtered_source) _cdb_quartiles',
+    '    FROM __cdb_filtered_source) _cdb_quartiles',
     '    WHERE quartile = 1 or quartile = 3',
     '    GROUP BY quartile',
     '  ) _cdb_iqr',
@@ -110,7 +110,7 @@ var binsQueryTpl = dot.template([
     '        )',
     '      )',
     '    END AS __cdb_bins_number',
-    '  FROM __cdb_basics, iqrange, filtered_source',
+    '  FROM __cdb_basics, iqrange, __cdb_filtered_source',
     '  LIMIT 1',
     ')'
 ].join('\n'));
@@ -173,7 +173,7 @@ var histogramQueryTpl = dot.template([
     '    max({{=it._column}})::numeric AS max,',
     '    avg({{=it._column}})::numeric AS avg,',
     '    count(*) AS freq',
-    'FROM filtered_source, __cdb_basics, __cdb_nulls, __cdb_bins{{?it._isFloatColumn}}, infinities, nans{{?}}',
+    'FROM __cdb_filtered_source, __cdb_basics, __cdb_nulls, __cdb_bins{{?it._isFloatColumn}}, infinities, nans{{?}}',
     'GROUP BY bin, __cdb_bins_number, bin_width, __cdb_nulls_count,',
     '  avg_val{{?it._isFloatColumn}}, infinities_count, nans_count{{?}}',
     'ORDER BY bin'