diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java
index 49c01b95a..bb3c87ac7 100644
--- a/htroot/PerformanceMemory_p.java
+++ b/htroot/PerformanceMemory_p.java
@@ -102,7 +102,8 @@ public class PerformanceMemory_p {
             map = Table.memoryStats(filename);
             prop.put("EcoList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p));
             prop.putNum("EcoList_" + c + "_tableSize", map.get("tableSize"));
-            
+
+            assert map.get("tableKeyMem") != null : map;
             mem = Long.parseLong(map.get("tableKeyMem"));
             totalmem += mem;
             prop.put("EcoList_" + c + "_tableKeyMem", Formatter.bytesToString(mem));
diff --git a/htroot/Status.html b/htroot/Status.html
index 91cfe8a56..57ce52e24 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -157,10 +157,11 @@
     #(/hintCrawlMonitor)#
     
     <!-- Social Networking -->
-    
+    <!--
     <dt class="hintIcon"><img src="env/grafics/idea.png" width="32" height="32" alt="idea"/></dt>
     <dd class="hint"><a href="http://twitter.com/yacy_search"><img src="/env/grafics/twitter_followme.png" alt="Follow YaCy on Twitter"/></a>
     </dd>
+    -->
     
     <!-- templates
     #(hint)#::
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 65804f13b..2e6096293 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -115,7 +115,7 @@ $(function() {
 	    #(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label>&nbsp;&nbsp;#(/searchvideo)#
 	    #(searchapp)#::<input type="radio" id="app" name="contentdom" value="app" #(check)#::checked="checked"#(/check)# /><label for="app">Applications</label>#(/searchapp)#
         &nbsp;
-        <a href="index.html?searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
+        <a href="index.html?searchoptions=1&amp;count=#[count]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
     </div>
     #(/searchdomswitches)#
     <input type="hidden" name="former" value="#[former]#" />
diff --git a/htroot/yacysearch_location.html b/htroot/yacysearch_location.html
index fda7ec6b7..37532a3c1 100644
--- a/htroot/yacysearch_location.html
+++ b/htroot/yacysearch_location.html
@@ -25,7 +25,7 @@
 					new OpenLayers.Control.Attribution()]
         });
         
-		layerMaplint = new OpenLayers.Layer.OSM.Maplint("Maplint");
+		//layerMaplint = new OpenLayers.Layer.OSM.Maplint("Maplint");
 		layerWMS = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
         layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
 		layerOsmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender");
@@ -33,7 +33,7 @@
 		map.addLayer(layerMapnik);
 	    map.addLayer(layerOsmarender);
 		map.addLayer(layerCycleMap);
-		map.addLayer(layerMaplint);
+		//map.addLayer(layerMaplint);
 		map.addLayer(layerWMS);
         map.addControl(new OpenLayers.Control.LayerSwitcher());
         map.setCenter(new OpenLayers.LonLat(15,30) // Center of the map
diff --git a/htroot/yacysearchtrailer.html b/htroot/yacysearchtrailer.html
index 520fde89d..c85c90efc 100644
--- a/htroot/yacysearchtrailer.html
+++ b/htroot/yacysearchtrailer.html
@@ -2,9 +2,9 @@
 
 #(cat-location)#::
 <div style="float: right; margin-top:5px; width: 220px;">
-<a href="yacysearch_location.html?query=#[queryenc]#&amp;display=#[display]#">
+<a href="yacysearch_location.html?query=#[queryenc]#">
 <img src="/env/grafics/earthsearch.png" width="215" height="159" alt="earthsearchlogo" /></a>
-<a href="yacysearch_location.html?query=#[queryenc]#&amp;display=#[display]#">Show search results for "#[query]#" on map</a>
+<a href="yacysearch_location.html?query=#[queryenc]#">Show search results for "#[query]#" on map</a>
 </div>
 #(/cat-location)#
 
diff --git a/source/net/yacy/kelondro/rwi/IndexCell.java b/source/net/yacy/kelondro/rwi/IndexCell.java
index a7792dd2f..58d29a16b 100644
--- a/source/net/yacy/kelondro/rwi/IndexCell.java
+++ b/source/net/yacy/kelondro/rwi/IndexCell.java
@@ -494,8 +494,9 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBu
                 } catch (Exception e) {
                     // catch all exceptions to prevent that no semaphore is released
                     Log.logException(e);
+                } finally {
+                    this.dumperSemaphore.release();
                 }
-                this.dumperSemaphore.release();
             } catch (InterruptedException e) {
                 Log.logException(e);
             }
@@ -514,8 +515,9 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBu
                 } catch (Exception e) {
                     // catch all exceptions to prevent that no semaphore is released
                     Log.logException(e);
+                } finally {
+                    this.cleanerSemaphore.release();
                 }
-                this.cleanerSemaphore.release();
             } catch (InterruptedException e) {
                 Log.logException(e);
             }