diff --git a/CHANGELOG.md b/CHANGELOG.md
index b103d4fcf8f..f5af81bc8d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 - Improvement to influxdb query editor, can now add where clause and alias (Issue #331, thanks @mavimo)
 - New config setting for graphite datasource to control if json render request is POST or GET (Issue #345)
 - Unsaved changes warning feature (Issue #324)
-
+- Fixes to filters and "All" option. It now never uses "*" as value, but all options in a {node1, node2, node3} expression (Issue #228, #359)
 
 # 1.5.3 (2014-04-17)
 - Add support for async scripted dashboards (Issue #274)
diff --git a/src/app/panels/filtering/module.js b/src/app/panels/filtering/module.js
index b613cc64e5c..3f6923073f8 100644
--- a/src/app/panels/filtering/module.js
+++ b/src/app/panels/filtering/module.js
@@ -61,17 +61,12 @@ function (angular, app, _) {
           });
 
           if (filter.includeAll) {
-            if(endsWithWildcard(filter.query)) {
-              filter.options.unshift({text: 'All', value: '*'});
-            }
-            else {
-              var allExpr = '{';
-              _.each(filter.options, function(option) {
-                allExpr += option.text + ',';
-              });
-              allExpr = allExpr.substring(0, allExpr.length - 1) + '}';
-              filter.options.unshift({text: 'All', value: allExpr});
-            }
+            var allExpr = '{';
+            _.each(filter.options, function(option) {
+              allExpr += option.text + ',';
+            });
+            allExpr = allExpr.substring(0, allExpr.length - 1) + '}';
+            filter.options.unshift({text: 'All', value: allExpr});
           }
 
           filterSrv.filterOptionSelected(filter, filter.options[0]);