Index: trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java	(revision 15815)
+++ trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java	(revision 15817)
@@ -3,6 +3,4 @@
 
 import java.util.Objects;
-
-import org.openstreetmap.josm.data.osm.Filter;
 
 /**
@@ -13,5 +11,5 @@
     private final String label;
     private final String description;
-    private final Filter filter;
+    private final AutoFilterManager.CompiledFilter filter;
 
     /**
@@ -21,5 +19,5 @@
      * @param filter associated filter
      */
-    public AutoFilter(String label, String description, Filter filter) {
+    public AutoFilter(String label, String description, AutoFilterManager.CompiledFilter filter) {
         this.label = label;
         this.description = description;
@@ -47,5 +45,5 @@
      * @return the filter
      */
-    public Filter getFilter() {
+    public AutoFilterManager.CompiledFilter getFilter() {
         return filter;
     }
Index: trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 15815)
+++ trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 15817)
@@ -149,5 +149,5 @@
             // Make sure current auto filter button remains visible even if no data is found, to allow user to disable it
             if (currentAutoFilter != null) {
-                values.add(currentAutoFilter.getFilter().text.split("=")[1]);
+                values.add(currentAutoFilter.getFilter().value);
             }
             if (!values.equals(buttons.keySet())) {
@@ -186,5 +186,5 @@
         MapView mapView = MainApplication.getMap().mapView;
         for (final String value : values.descendingSet()) {
-            Filter filter = new CompiledFilter(enabledRule.getKey(), value);
+            CompiledFilter filter = new CompiledFilter(enabledRule.getKey(), value);
             String label = enabledRule.getValueFormatter().apply(value);
             AutoFilter autoFilter = new AutoFilter(label, filter.text, filter);