diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index c15f0506..8c6fff54 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -5,11 +5,28 @@ var debug = require('debug')('windshaft:widget:aggregation');
 var dot = require('dot');
 dot.templateSettings.strip = false;
 
+var filteredQueryTpl = dot.template([
+    'filtered_source AS (',
+    '  SELECT *',
+    '  FROM ({{=it._query}}) _cdb_filtered_source',
+    '  WHERE',
+    '    {{=it._column}} IS NOT NULL',
+    '  AND',
+    '    {{=it._aggregationColumn}} != \'infinity\'::float',
+    '  AND',
+    '    {{=it._aggregationColumn}} != \'-infinity\'::float',
+    '  AND',
+    '    {{=it._aggregationColumn}} != \'NaN\'::float',
+    ')'
+].join(' \n'));
+
 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(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}} = \'NaN\'::float THEN 1 ELSE 0 END) AS nans_count',
     '  FROM ({{=it._query}}) _cdb_aggregation_nulls',
     ')'
 ].join('\n'));
@@ -57,9 +74,9 @@ var rankedAggregationQueryTpl = dot.template([
 
 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',
+    '  nulls_count, min_val, max_val, count, categories_count, 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',
+    'GROUP BY category, nulls_count, min_val, max_val, count, categories_count, nans_count, infinities_count',
     'ORDER BY value DESC'
 ].join('\n'));
 
@@ -128,6 +145,8 @@ Aggregation.prototype.sql = function(psql, override, callback) {
 
     var aggregationSql;
 
+
+
     if (!!override.ownFilter) {
         aggregationSql = [
             this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
@@ -157,28 +176,34 @@ Aggregation.prototype.sql = function(psql, override, callback) {
 
 Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn) {
     return [
-                "WITH",
-                [
-                    summaryQueryTpl({
-                        _query: query,
-                        _column: column
-                    }),
-                    rankedCategoriesQueryTpl({
-                        _query: query,
-                        _column: column,
-                        _aggregation: this.getAggregationSql(),
-                        _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
-                    }),
-                    categoriesSummaryMinMaxQueryTpl({
-                        _query: query,
-                        _column: column
-                    }),
-                    categoriesSummaryCountQueryTpl({
-                        _query: query,
-                        _column: column
-                    })
-                ].join(',\n')
-            ].join('\n');
+        "WITH",
+        [
+            filteredQueryTpl({
+                _query: this.query,
+                _column: this.column,
+                _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
+            }),
+            summaryQueryTpl({
+                _query: query,
+                _column: column,
+                _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
+            }),
+            rankedCategoriesQueryTpl({
+                _query: query,
+                _column: column,
+                _aggregation: this.getAggregationSql(),
+                _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
+            }),
+            categoriesSummaryMinMaxQueryTpl({
+                _query: query,
+                _column: column
+            }),
+            categoriesSummaryCountQueryTpl({
+                _query: query,
+                _column: column
+            })
+        ].join(',\n')
+    ].join('\n');
 };
 
 var aggregationFnQueryTpl = dot.template('{{=it._aggregationFn}}({{=it._aggregationColumn}})');
@@ -193,6 +218,8 @@ Aggregation.prototype.format = function(result) {
     var categories = [];
     var count = 0;
     var nulls = 0;
+    var nans = 0;
+    var infinities = 0;
     var minValue = 0;
     var maxValue = 0;
     var categoriesCount = 0;
@@ -202,12 +229,14 @@ Aggregation.prototype.format = function(result) {
         var firstRow = result.rows[0];
         count = firstRow.count;
         nulls = firstRow.nulls_count;
+        nans = firstRow.nans_count;
+        infinities = firstRow.infinities_count;
         minValue = firstRow.min_val;
         maxValue = firstRow.max_val;
         categoriesCount = firstRow.categories_count;
 
         result.rows.forEach(function(row) {
-            categories.push(_.omit(row, 'count', 'nulls_count', 'min_val', 'max_val', 'categories_count'));
+            categories.push(_.omit(row, 'count', 'nulls_count', 'min_val', 'max_val', 'categories_count', 'nans_count', 'infinities_count'));
         });
     }
 
@@ -215,6 +244,8 @@ Aggregation.prototype.format = function(result) {
         aggregation: this.aggregation,
         count: count,
         nulls: nulls,
+        nans: nans,
+        infinities: infinities,
         min: minValue,
         max: maxValue,
         categoriesCount: categoriesCount,