diff --git a/app/assets/javascripts/controllers/admin/statistics.coffee.erb b/app/assets/javascripts/controllers/admin/statistics.coffee.erb
index cf7eca994..0f7cc8c21 100644
--- a/app/assets/javascripts/controllers/admin/statistics.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/statistics.coffee.erb
@@ -447,16 +447,9 @@ Application.Controllers.controller "StatisticsController", ["$scope", "$state",
     if custom
       criterion = buildElasticCustomCriterion(custom)
       if (custom.exclude)
-        q = "query": {
-          "filtered": {
-            "query": q.query,
-            "filter": {
-              "not": {
-                "term": criterion.match
-              }
-            }
-          }
-        }
+        q.query.bool.must_not = [
+          "term": criterion.match
+        ]
       else
         q.query.bool.must.push(criterion)
 
diff --git a/app/services/custom_aggregation_service.rb b/app/services/custom_aggregation_service.rb
index 034e237b8..03aed7939 100644
--- a/app/services/custom_aggregation_service.rb
+++ b/app/services/custom_aggregation_service.rb
@@ -29,7 +29,7 @@ class CustomAggregationService
 
           exclude = custom_query.delete('exclude')
           if exclude
-            query = {query: { filtered: { query: query['query'], filter: { not: { term: custom_query['match'] } } } }, aggregations: query['aggregations'], size: query['size']}
+            query['query']['bool']['must_not'] = [{ term: custom_query['match'] }]
           else
             query['query']['bool']['must'].push(custom_query)
           end