diff --git a/source/de/anomic/plasma/plasmaSearchQuery.java b/source/de/anomic/plasma/plasmaSearchQuery.java
index f626abd10..73e600a58 100644
--- a/source/de/anomic/plasma/plasmaSearchQuery.java
+++ b/source/de/anomic/plasma/plasmaSearchQuery.java
@@ -30,6 +30,7 @@ import de.anomic.htmlFilter.htmlFilterAbstractScraper;
 import de.anomic.htmlFilter.htmlFilterCharacterCoding;
 import de.anomic.kelondro.order.Base64Order;
 import de.anomic.kelondro.order.Bitfield;
+import de.anomic.kelondro.order.NaturalOrder;
 import de.anomic.kelondro.util.SetTools;
 import de.anomic.plasma.parser.Word;
 import de.anomic.plasma.parser.Condenser;
@@ -252,9 +253,9 @@ public final class plasmaSearchQuery {
     @SuppressWarnings("unchecked")
     public static TreeSet<String>[] cleanQuery(String querystring) {
         // returns three sets: a query set, a exclude set and a full query set
-        final TreeSet<String> query = new TreeSet<String>();
-        final TreeSet<String> exclude = new TreeSet<String>();
-        final TreeSet<String> fullquery = new TreeSet<String>();
+        final TreeSet<String> query = new TreeSet<String>(NaturalOrder.naturalComparator);
+        final TreeSet<String> exclude = new TreeSet<String>(NaturalOrder.naturalComparator);
+        final TreeSet<String> fullquery = new TreeSet<String>(NaturalOrder.naturalComparator);
         
         if ((querystring == null) || (querystring.length() == 0)) return new TreeSet[]{query, exclude, fullquery};
         
diff --git a/source/de/anomic/xml/SurrogateReader.java b/source/de/anomic/xml/SurrogateReader.java
index 85c6be2f6..002229629 100644
--- a/source/de/anomic/xml/SurrogateReader.java
+++ b/source/de/anomic/xml/SurrogateReader.java
@@ -159,10 +159,6 @@ public class SurrogateReader extends DefaultHandler implements Runnable {
             return null;
         }
     }
-
-    public void remove() {
-        throw new UnsupportedOperationException("cannot remove here");
-    }
     
     public static void main(String[] args) {
         File f = new File(args[0]);