diff --git a/source/de/anomic/plasma/plasmaSearchEvent.java b/source/de/anomic/plasma/plasmaSearchEvent.java
index 9439bf120..249213774 100644
--- a/source/de/anomic/plasma/plasmaSearchEvent.java
+++ b/source/de/anomic/plasma/plasmaSearchEvent.java
@@ -163,6 +163,7 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
         // retrieve entities that belong to the hashes
         profileLocal.startTimer();
         Set entities = wordIndex.getEntities(query.queryHashes, true, true, profileLocal.getTargetTime(plasmaSearchProfile.PROCESS_COLLECTION));
+        if (entities.size() < query.size()) entities = null; // prevent that only a subset is returned
         profileLocal.setYieldTime(plasmaSearchProfile.PROCESS_COLLECTION);
         profileLocal.setYieldCount(plasmaSearchProfile.PROCESS_COLLECTION, (entities == null) ? 0 : entities.size());
         
diff --git a/source/de/anomic/plasma/plasmaWordIndex.java b/source/de/anomic/plasma/plasmaWordIndex.java
index 2b9953f77..2e6961953 100644
--- a/source/de/anomic/plasma/plasmaWordIndex.java
+++ b/source/de/anomic/plasma/plasmaWordIndex.java
@@ -194,7 +194,7 @@ public final class plasmaWordIndex {
         while (i.hasNext()) {
             // check time
             remaining = maxTime - (System.currentTimeMillis() - start);
-            if ((maxTime > 0) && (remaining <= 0)) break;
+            //if ((maxTime > 0) && (remaining <= 0)) break;
             
             // get next hash:
             singleHash = (String) i.next();