diff --git a/source/yacy.java b/source/yacy.java
index 05b99ca65..c5d251307 100644
--- a/source/yacy.java
+++ b/source/yacy.java
@@ -1278,17 +1278,14 @@ public final class yacy {
             if (resource.equals("all")) {
                 plasmaWordIndex WordIndex = new plasmaWordIndex(homeDBroot, 8*1024*1024, log);
                 WordHashIterator = WordIndex.wordHashes(wordChunkStartHash, true, false);
-            }
-            if (resource.equals("assortments")) {
+            } else if (resource.equals("assortments")) {
                 plasmaWordIndexAssortmentCluster assortmentCluster = new plasmaWordIndexAssortmentCluster(new File(homeDBroot, "ACLUSTER"), 64, 16*1024*1024, log);
                 WordHashIterator = assortmentCluster.hashConjunction(wordChunkStartHash, true);
-            }
-            if (resource.startsWith("assortment")) {
+            } else if (resource.startsWith("assortment")) {
                 int a = Integer.parseInt(resource.substring(10));
                 plasmaWordIndexAssortment assortment = new plasmaWordIndexAssortment(new File(homeDBroot, "ACLUSTER"), a, 8*1024*1024, null);
                 WordHashIterator = assortment.hashes(wordChunkStartHash, true, false);
-            }
-            if (resource.equals("words")) {
+            } else if (resource.equals("words")) {
                 plasmaWordIndexClassicDB fileDB = new plasmaWordIndexClassicDB(homeDBroot, log);
                 WordHashIterator = fileDB.wordHashes(wordChunkStartHash, true);
             }