Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 2867)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 2868)
@@ -69,5 +69,5 @@
         public String toString()
         {
-            return super.toString()+ "["+level+"]: " + bbox;
+            return super.toString()+ "["+level+"]: " + bbox();
         }
         public QBLevel(QBLevel parent)
@@ -142,5 +142,5 @@
                 out("splitting "+this.bbox()+" level "+level+" with "
                         + content.size() + " entries (my dimensions: "
-                        + this.bbox.width()+", "+this.bbox.height()+")");
+                        + this.bbox().width()+", "+this.bbox().height()+")");
             }
             // deferring allocation of children until use
@@ -586,5 +586,5 @@
             return width()/2;
         }
-        BBox bbox = null;
+        private BBox bbox = null;
         public BBox bbox()
         {
@@ -764,5 +764,5 @@
         return this.remove(convert(o));
     }
-    public boolean remove_slow(T removeme)
+    private boolean remove_slow(T removeme)
     {
         boolean ret = false;
@@ -799,4 +799,5 @@
             out("qb remove result: " + ret);
         }
+        search_cache = null; // Search cache might point to one of removed buckets
         return ret;
     }