diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index 9ce889da..6e46ea31 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -25,7 +25,13 @@ var summaryQueryTpl = dot.template([
     '  SELECT',
     '  count(1) AS count,',
     '  sum(CASE WHEN {{=it._column}} IS NULL THEN 1 ELSE 0 END) AS nulls_count,',
-    '  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}} = \'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',
     ')'
@@ -61,12 +67,13 @@ var categoriesSummaryCountQueryTpl = dot.template([
 ].join('\n'));
 
 var rankedAggregationQueryTpl = dot.template([
-    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val, count, categories_count, nans_count, infinities_count',
+    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val,',
+    '    count, categories_count, 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, nans_count, infinities_count',
+    'SELECT \'Other\' category, {{=it._aggregationFn}}(value) as value, true as agg, nulls_count,',
+    '       min_val, max_val, count, categories_count, 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, nans_count, infinities_count'
@@ -234,7 +241,8 @@ Aggregation.prototype.format = function(result) {
         categoriesCount = firstRow.categories_count;
 
         result.rows.forEach(function(row) {
-            categories.push(_.omit(row, 'count', 'nulls_count', 'min_val', 'max_val', 'categories_count', 'nans_count', 'infinities_count'));
+            categories.push(_.omit(row, 'count', 'nulls_count', 'min_val',
+                'max_val', 'categories_count', 'nans_count', 'infinities_count'));
         });
     }
 
diff --git a/test/acceptance/dataviews/aggregation.js b/test/acceptance/dataviews/aggregation.js
index 71aec370..4f7c0062 100644
--- a/test/acceptance/dataviews/aggregation.js
+++ b/test/acceptance/dataviews/aggregation.js
@@ -244,9 +244,9 @@ describe.only('aggregation-dataview: special float values', function() {
                 dataview.categories.forEach(function (category) {
                     assert.ok(category.category === 'category_2');
                     assert.ok(category.value === 501);
-                })
+                });
                 done();
             });
         });
-    })
+    });
 });