diff --git a/lib/cartodb/models/dataview/overviews/aggregation.js b/lib/cartodb/models/dataview/overviews/aggregation.js
index cc95e73c..730ba822 100644
--- a/lib/cartodb/models/dataview/overviews/aggregation.js
+++ b/lib/cartodb/models/dataview/overviews/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',
     '  sum(_feature_count) 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,34 +66,38 @@ 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, sum(value), true 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}}',
-    '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 filtered_source, 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'));
 
 var CATEGORIES_LIMIT = 6;
 
- function Aggregation(query, options, queryRewriter, queryRewriteData, params) {
+ function Aggregation(query, options, queryRewriter, queryRewriteData, params, queries) {
     BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);
 
     this.query = query;
+    this.queries = queries;
     this.column = options.column;
     this.aggregation = options.aggregation;
     this.aggregationColumn = options.aggregationColumn;
+    this._isFloatColumn = null;
 }
 
 Aggregation.prototype = Object.create(BaseOverviewsDataview.prototype);
@@ -104,6 +106,8 @@ Aggregation.prototype.constructor = Aggregation;
 module.exports = Aggregation;
 
 Aggregation.prototype.sql = function(psql, override, callback) {
+    var self = this;
+
     if (!callback) {
         callback = override;
         override = {};
@@ -112,17 +116,30 @@ Aggregation.prototype.sql = function(psql, override, callback) {
     var _query = this.rewrittenQuery(this.query);
     var _aggregationColumn = this.aggregation !== 'count' ? this.aggregationColumn : null;
 
+    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 aggregationSql;
     if (!!override.ownFilter) {
         aggregationSql = [
             "WITH",
             [
                 filteredQueryTpl({
+                    _isFloatColumn: this._isFloatColumn,
                     _query: _query,
                     _column: this.column,
                     _aggregationColumn: _aggregationColumn
                 }),
                 summaryQueryTpl({
+                    _isFloatColumn: this._isFloatColumn,
                     _query: _query,
                     _column: this.column,
                     _aggregationColumn: _aggregationColumn
@@ -143,6 +160,7 @@ Aggregation.prototype.sql = function(psql, override, callback) {
                 })
             ].join(',\n'),
             aggregationQueryTpl({
+                _isFloatColumn: this._isFloatColumn,
                 _query: _query,
                 _column: this.column,
                 _aggregation: this.getAggregationSql(),
@@ -154,11 +172,13 @@ Aggregation.prototype.sql = function(psql, override, callback) {
             "WITH",
             [
                 filteredQueryTpl({
+                    _isFloatColumn: this._isFloatColumn,
                     _query: _query,
                     _column: this.column,
                     _aggregationColumn: _aggregationColumn
                 }),
                 summaryQueryTpl({
+                    _isFloatColumn: this._isFloatColumn,
                     _query: _query,
                     _column: this.column,
                     _aggregationColumn: _aggregationColumn
@@ -179,6 +199,7 @@ Aggregation.prototype.sql = function(psql, override, callback) {
                 })
             ].join(',\n'),
             rankedAggregationQueryTpl({
+                _isFloatColumn: this._isFloatColumn,
                 _query: _query,
                 _column: this.column,
                 _limit: CATEGORIES_LIMIT