diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index 77f37723..1a4fc3ed 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -2,90 +2,134 @@ var _ = require('underscore');
 var BaseWidget = require('./base');
 var debug = require('debug')('windshaft:widget:aggregation');
 
-var dot = require('dot');
-dot.templateSettings.strip = false;
+const filteredQueryTpl = ctx => `
+    filtered_source AS (
+        SELECT *
+        FROM (${ctx._query}) _cdb_filtered_source
+        ${ctx._aggregationColumn && ctx._isFloatColumn ? `
+        WHERE
+            ${ctx._aggregationColumn} != 'infinity'::float
+        AND
+            ${ctx._aggregationColumn} != '-infinity'::float
+        AND
+            ${ctx._aggregationColumn} != 'NaN'::float` :
+        ''
+        }
+    )
+`;
 
-var filteredQueryTpl = dot.template([
-    'filtered_source AS (',
-    '  SELECT *',
-    '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  {{?it._aggregationColumn && it._isFloatColumn}}WHERE',
-    '    {{=it._aggregationColumn}} != \'infinity\'::float',
-    '  AND',
-    '    {{=it._aggregationColumn}} != \'-infinity\'::float',
-    '  AND',
-    '    {{=it._aggregationColumn}} != \'NaN\'::float{{?}}',
-    ')'
-].join(' \n'));
+const summaryQueryTpl = ctx => `
+    summary AS (
+        SELECT
+            count(1) AS count,
+            sum(CASE WHEN ${ctx._column} IS NULL THEN 1 ELSE 0 END) AS nulls_count
+            ${ctx._isFloatColumn ? `,
+            sum(
+                CASE
+                    WHEN ${ctx._aggregationColumn} = 'infinity'::float OR ${ctx._aggregationColumn} = '-infinity'::float
+                    THEN 1
+                    ELSE 0
+                    END
+            ) AS infinities_count,
+            sum(CASE WHEN ${ctx._aggregationColumn} = 'NaN'::float THEN 1 ELSE 0 END) AS nans_count` :
+            ''
+            }
+        FROM (${ctx._query}) _cdb_aggregation_nulls
+    )
+`;
 
-var summaryQueryTpl = dot.template([
-    'summary AS (',
-    '  SELECT',
-    '  count(1) AS count,',
-    '  sum(CASE WHEN {{=it._column}} IS NULL THEN 1 ELSE 0 END) AS nulls_count',
-    '  {{?it._isFloatColumn}},sum(',
-    '    CASE',
-    '      WHEN {{=it._aggregationColumn}} = \'infinity\'::float OR {{=it._aggregationColumn}} = \'-infinity\'::float',
-    '      THEN 1',
-    '      ELSE 0',
-    '    END',
-    '  ) AS infinities_count,',
-    '  sum(CASE WHEN {{=it._aggregationColumn}} = \'NaN\'::float THEN 1 ELSE 0 END) AS nans_count{{?}}',
-    '  FROM ({{=it._query}}) _cdb_aggregation_nulls',
-    ')'
-].join('\n'));
+const rankedCategoriesQueryTpl = ctx => `
+    categories AS(
+        SELECT
+            ${ctx._column} AS category,
+            ${ctx._aggregation} AS value,
+            row_number() OVER (ORDER BY ${ctx._aggregation} desc) as rank
+        FROM filtered_source
+        ${ctx._aggregationColumn !== null ? `WHERE ${ctx._aggregationColumn} IS NOT NULL` : ''}
+        GROUP BY ${ctx._column}
+        ORDER BY 2 DESC
+    )
+`;
 
-var rankedCategoriesQueryTpl = dot.template([
-    'categories AS(',
-    '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
-    '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
-    '  FROM filtered_source',
-    '  {{?it._aggregationColumn!==null}}WHERE {{=it._aggregationColumn}} IS NOT NULL{{?}}',
-    '  GROUP BY {{=it._column}}',
-    '  ORDER BY 2 DESC',
-    ')'
-].join('\n'));
+const categoriesSummaryMinMaxQueryTpl = () => `
+    categories_summary_min_max AS(
+        SELECT
+            max(value) max_val,
+            min(value) min_val
+        FROM categories
+    )
+`;
 
-var categoriesSummaryMinMaxQueryTpl = dot.template([
-    'categories_summary_min_max AS(',
-    '  SELECT max(value) max_val, min(value) min_val',
-    '  FROM categories',
-    ')'
-].join('\n'));
+const categoriesSummaryCountQueryTpl = ctx => `
+    categories_summary_count AS(
+        SELECT count(1) AS categories_count
+        FROM (
+            SELECT ${ctx._column} AS category
+            FROM (${ctx._query}) _cdb_categories
+            GROUP BY ${ctx._column}
+        ) _cdb_categories_count
+    )
+`;
 
-var categoriesSummaryCountQueryTpl = dot.template([
-    'categories_summary_count AS(',
-    '  SELECT count(1) AS categories_count',
-    '  FROM (',
-    '    SELECT {{=it._column}} AS category',
-    '    FROM ({{=it._query}}) _cdb_categories',
-    '    GROUP BY {{=it._column}}',
-    '  ) _cdb_categories_count',
-    ')'
-].join('\n'));
+const specialNumericValuesColumns = () => `, nans_count, infinities_count`;
 
-var rankedAggregationQueryTpl = dot.template([
-    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val,',
-    '    count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
-    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
-    '  WHERE rank < {{=it._limit}}',
-    'UNION ALL',
-    'SELECT \'Other\' category, {{=it._aggregationFn}}(value) as value, true as agg, nulls_count,',
-    '       min_val, max_val, count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
-    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
-    '  WHERE rank >= {{=it._limit}}',
-    'GROUP BY nulls_count, min_val, max_val, count,',
-    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}'
-].join('\n'));
+const rankedAggregationQueryTpl = ctx => `
+    SELECT
+        CAST(category AS text),
+        value,
+        false as agg,
+        nulls_count,
+        min_val,
+        max_val,
+        count,
+        categories_count
+        ${ctx._isFloatColumn ? `${specialNumericValuesColumns(ctx)}` : '' }
+        FROM categories, summary, categories_summary_min_max, categories_summary_count
+        WHERE rank < ${ctx._limit}
+    UNION ALL
+    SELECT
+        'Other' category,
+        ${ctx._aggregationFn}(value) as value,
+        true as agg,
+        nulls_count,
+        min_val,
+        max_val,
+        count,
+        categories_count
+        ${ctx._isFloatColumn ? `${specialNumericValuesColumns(ctx)}` : '' }
+        FROM categories, summary, categories_summary_min_max, categories_summary_count
+        WHERE rank >= ${ctx._limit}
+    GROUP BY
+        nulls_count,
+        min_val,
+        max_val,
+        count,
+        categories_count
+        ${ctx._isFloatColumn ? `${specialNumericValuesColumns(ctx)}` : '' }
+`;
 
-var aggregationQueryTpl = dot.template([
-    'SELECT CAST({{=it._column}} AS text) AS category, {{=it._aggregation}} AS value, false as agg,',
-    '  nulls_count, min_val, max_val, count, categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
-    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count',
-    'GROUP BY category, nulls_count, min_val, max_val, count,',
-    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}',
-    'ORDER BY value DESC'
-].join('\n'));
+const aggregationQueryTpl = ctx => `
+    SELECT
+        CAST(${ctx._column} AS text) AS category,
+        ${ctx._aggregation} AS value,
+        false as agg,
+        nulls_count,
+        min_val,
+        max_val,
+        count,
+        categories_count
+        ${ctx._isFloatColumn ? `${specialNumericValuesColumns(ctx)}` : '' }
+    FROM (${ctx._query}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count
+    GROUP BY
+        category,
+        nulls_count,
+        min_val,
+        max_val,
+        count,
+        categories_count
+        ${ctx._isFloatColumn ? `${specialNumericValuesColumns(ctx)}` : '' }
+    ORDER BY value DESC
+`;
 
 var CATEGORIES_LIMIT = 6;
 
@@ -242,7 +286,8 @@ Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation,
     ].join('\n');
 };
 
-var aggregationFnQueryTpl = dot.template('{{=it._aggregationFn}}({{=it._aggregationColumn}})');
+const aggregationFnQueryTpl = ctx => `${ctx._aggregationFn}(${ctx._aggregationColumn})`;
+
 Aggregation.prototype.getAggregationSql = function() {
     return aggregationFnQueryTpl({
         _aggregationFn: this.aggregation,
@@ -290,32 +335,33 @@ Aggregation.prototype.format = function(result) {
     };
 };
 
-var filterCategoriesQueryTpl = dot.template([
-    'SELECT {{=it._column}} AS category, {{=it._value}} AS value',
-    'FROM ({{=it._query}}) _cdb_aggregation_search',
-    'WHERE CAST({{=it._column}} as text) ILIKE {{=it._userQuery}}',
-    'GROUP BY {{=it._column}}'
-].join('\n'));
-
-var searchQueryTpl = dot.template([
-    'WITH',
-    'search_unfiltered AS (',
-    '  {{=it._searchUnfiltered}}',
-    '),',
-    'search_filtered AS (',
-    '  {{=it._searchFiltered}}',
-    '),',
-    'search_union AS (',
-    '  SELECT * FROM search_unfiltered',
-    '  UNION ALL',
-    '  SELECT * FROM search_filtered',
-    ')',
-    'SELECT category, sum(value) AS value',
-    'FROM search_union',
-    'GROUP BY category',
-    'ORDER BY value desc'
-].join('\n'));
+const filterCategoriesQueryTpl = ctx => `
+    SELECT
+        ${ctx._column} AS category,
+        ${ctx._value} AS value
+    FROM (${ctx._query}) _cdb_aggregation_search
+    WHERE CAST(${ctx._column} as text) ILIKE ${ctx._userQuery}
+    GROUP BY ${ctx._column}
+`;
 
+const searchQueryTpl = ctx => `
+    WITH
+    search_unfiltered AS (
+        ${ctx._searchUnfiltered}
+    ),
+    search_filtered AS (
+        ${ctx._searchFiltered}
+    ),
+    search_union AS (
+        SELECT * FROM search_unfiltered
+        UNION ALL
+        SELECT * FROM search_filtered
+    )
+    SELECT category, sum(value) AS value
+    FROM search_union
+    GROUP BY category
+    ORDER BY value desc
+`;
 
 Aggregation.prototype.search = function(psql, userQuery, callback) {
     var self = this;