diff --git a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
index 7551f07e40..e59bc85f18 100644
--- a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
+++ b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
@@ -350,6 +350,7 @@ implements ZoomChangeListener, MapModeChangeListener, DataSetListener, Preferenc
     @Override
     public void dataChanged(DataChangedEvent event) {
         updateFiltersFull();
+        updateButtons();
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java
index ec1f98d145..0710d4a03b 100644
--- a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java
+++ b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java
@@ -153,6 +153,7 @@ public class AutoFilterRule {
      * @return a stream of numeric values
      */
     public IntStream getTagValuesForPrimitive(OsmPrimitive osm, boolean directValuesOnly) {
+        if (osm.isDeleted()) return IntStream.empty();
         if (allKeys.size() == 1) {
             IntStream values = getTagValuesForPrimitive(osm, key, directValuesOnly);
             if (values != null) return values;