diff --git a/source/de/anomic/http/httpdProxyHandler.java b/source/de/anomic/http/httpdProxyHandler.java
index 187326b65..fc2751c39 100644
--- a/source/de/anomic/http/httpdProxyHandler.java
+++ b/source/de/anomic/http/httpdProxyHandler.java
@@ -229,7 +229,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt
             
             // load a transformer
             transformer = new htmlFilterContentTransformer();
-            transformer.init(new File(switchboard.getRootPath(), switchboard.getConfig("plasmaBlueList", "")).toString());
+            transformer.init(new File(switchboard.getRootPath(), switchboard.getConfig(plasmaSwitchboard.LIST_BLUE, "")).toString());
             
             String f;
             // load the yellow-list
diff --git a/source/de/anomic/plasma/plasmaSearchEvent.java b/source/de/anomic/plasma/plasmaSearchEvent.java
index b1ff9fb56..f9163d12c 100644
--- a/source/de/anomic/plasma/plasmaSearchEvent.java
+++ b/source/de/anomic/plasma/plasmaSearchEvent.java
@@ -339,7 +339,7 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
         // retrieve entities that belong to the hashes
         profileLocal.startTimer();
         long start = System.currentTimeMillis();
-        Map inclusionContainers = wordIndex.getContainers(
+        Map inclusionContainers = (query.queryHashes.size() == 0) ? new HashMap() : wordIndex.getContainers(
                         query.queryHashes,
                         urlselection,
                         true,
@@ -369,6 +369,7 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
         profileLocal.startTimer();
         long start = System.currentTimeMillis();
         indexContainer rcLocal = indexContainer.joinContainers(includeContainers,
+        		(query.queryHashes.size() == 0) ? 0 :
                 profileLocal.getTargetTime(plasmaSearchTimingProfile.PROCESS_JOIN) * query.queryHashes.size() / (query.queryHashes.size() + query.excludeHashes.size()),
                 query.maxDistance);
         long remaining = profileLocal.getTargetTime(plasmaSearchTimingProfile.PROCESS_JOIN) - System.currentTimeMillis() + start;