diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index e61b1454..0d576614 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -9,14 +9,12 @@ var filteredQueryTpl = dot.template([
     'filtered_source AS (',
     '  SELECT *',
     '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  {{?it._aggregationColumn}}',
-    '  WHERE',
+    '  {{?it._aggregationColumn && it._isFloatColumn}}WHERE',
     '    {{=it._aggregationColumn}} != \'infinity\'::float',
     '  AND',
     '    {{=it._aggregationColumn}} != \'-infinity\'::float',
     '  AND',
-    '    {{=it._aggregationColumn}} != \'NaN\'::float',
-    '  {{?}}',
+    '    {{=it._aggregationColumn}} != \'NaN\'::float{{?}}',
     ')'
 ].join(' \n'));
 
@@ -24,15 +22,15 @@ 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,',
-    '  sum(',
+    '  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',
+    '  sum(CASE WHEN {{=it._aggregationColumn}} = \'NaN\'::float THEN 1 ELSE 0 END) AS nans_count{{?}}',
     '  FROM ({{=it._query}}) _cdb_aggregation_nulls',
     ')'
 ].join('\n'));
@@ -68,22 +66,24 @@ var categoriesSummaryCountQueryTpl = dot.template([
 
 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',
+    '    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, nans_count, infinities_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, nans_count, infinities_count'
+    'GROUP BY nulls_count, min_val, max_val, count,',
+    '  categories_count{{?it._isFloatColumn}}, nans_count, infinities_count{{?}}'
 ].join('\n'));
 
 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, nans_count, infinities_count',
+    '  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, nans_count, infinities_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'));
 
@@ -108,7 +108,7 @@ var TYPE = 'aggregation';
      }
  }
  */
-function Aggregation(query, options) {
+function Aggregation(query, options, queries) {
     if (!_.isString(options.column)) {
         throw new Error('Aggregation expects `column` in widget options');
     }
@@ -132,9 +132,11 @@ function Aggregation(query, options) {
     BaseWidget.apply(this);
 
     this.query = query;
+    this.queries = queries;
     this.column = options.column;
     this.aggregation = options.aggregation;
     this.aggregationColumn = options.aggregationColumn;
+    this._isFloatColumn = null;
 }
 
 Aggregation.prototype = new BaseWidget();
@@ -143,19 +145,39 @@ Aggregation.prototype.constructor = Aggregation;
 module.exports = Aggregation;
 
 Aggregation.prototype.sql = function(psql, override, callback) {
+    var self = this;
+
     if (!callback) {
         callback = override;
         override = {};
     }
 
+    if (this.aggregationColumn && this._isFloatColumn === null) {
+        this._isFloatColumn = false;
+        this.getColumnType(psql, this.aggregationColumn, this.queries.no_filters, function (err, type) {
+            if (!err && !!type) {
+                self._isFloatColumn = type.float;
+            }
+            self.sql(psql, override, callback);
+        });
+        return null;
+    }
+
     var _query = this.query;
 
     var aggregationSql;
 
     if (!!override.ownFilter) {
         aggregationSql = [
-            this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
+            this.getCategoriesCTESql(
+                _query,
+                this.column,
+                this.aggregation,
+                this.aggregationColumn,
+                this._isFloatColumn
+            ),
             aggregationQueryTpl({
+                _isFloatColumn: this._isFloatColumn,
                 _query: _query,
                 _column: this.column,
                 _aggregation: this.getAggregationSql(),
@@ -164,8 +186,15 @@ Aggregation.prototype.sql = function(psql, override, callback) {
         ].join('\n');
     } else {
         aggregationSql = [
-            this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
+            this.getCategoriesCTESql(
+                _query,
+                this.column,
+                this.aggregation,
+                this.aggregationColumn,
+                this._isFloatColumn
+            ),
             rankedAggregationQueryTpl({
+                _isFloatColumn: this._isFloatColumn,
                 _query: _query,
                 _column: this.column,
                 _aggregationFn: this.aggregation !== 'count' ? this.aggregation : 'sum',
@@ -179,16 +208,18 @@ Aggregation.prototype.sql = function(psql, override, callback) {
     return callback(null, aggregationSql);
 };
 
-Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn) {
+Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn, isFloatColumn) {
     return [
         "WITH",
         [
             filteredQueryTpl({
+                _isFloatColumn: isFloatColumn,
                 _query: this.query,
                 _column: this.column,
                 _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
             }),
             summaryQueryTpl({
+                _isFloatColumn: isFloatColumn,
                 _query: query,
                 _column: column,
                 _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null