Index: trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java	(revision 10710)
+++ trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java	(revision 10711)
@@ -9,4 +9,5 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -27,5 +28,5 @@
             return;
         DataSet ds = getLayerManager().getEditDataSet();
-        ds.setSelected(ds.allNonDeletedCompletePrimitives());
+        ds.setSelected(ds.getPrimitives(OsmPrimitive::isSelectable));
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 10710)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 10711)
@@ -673,7 +673,7 @@
                 Collection<OsmPrimitive> all;
                 if (setting.allElements) {
-                    all = Main.getLayerManager().getEditDataSet().allPrimitives();
+                    all = ds.allPrimitives();
                 } else {
-                    all = Main.getLayerManager().getEditDataSet().allNonDeletedCompletePrimitives();
+                    all = ds.getPrimitives(OsmPrimitive::isSelectable);
                 }
                 final ProgressMonitor subMonitor = getProgressMonitor().createSubTaskMonitor(all.size(), false);