diff --git a/.classpath b/.classpath
index 564e71e4b..e0d5b4d3e 100644
--- a/.classpath
+++ b/.classpath
@@ -43,9 +43,9 @@
 	<classpathentry kind="lib" path="lib/spatial4j-0.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/zookeeper-3.4.6.jar"/>
 	<classpathentry kind="lib" path="lib/org.restlet.jar"/>
-	<classpathentry kind="lib" path="lib/fontbox-1.8.8.jar"/>
-	<classpathentry kind="lib" path="lib/jempbox-1.8.8.jar"/>
-	<classpathentry kind="lib" path="lib/pdfbox-1.8.8.jar"/>
+	<classpathentry kind="lib" path="lib/fontbox-1.8.9.jar"/>
+	<classpathentry kind="lib" path="lib/jempbox-1.8.9.jar"/>
+	<classpathentry kind="lib" path="lib/pdfbox-1.8.9.jar"/>
 	<classpathentry kind="lib" path="lib/bcmail-jdk15-1.46.jar"/>
 	<classpathentry kind="lib" path="lib/bcprov-jdk15-1.46.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.10.1.jar"/>
diff --git a/build.xml b/build.xml
index 6353d4da2..0268bf5b0 100644
--- a/build.xml
+++ b/build.xml
@@ -172,7 +172,7 @@
     	<pathelement location="${lib}/commons-jxpath-1.3.jar" />
     	<pathelement location="${lib}/commons-lang-2.6.jar" />
     	<pathelement location="${lib}/commons-logging-1.2.jar" />
-    	<pathelement location="${lib}/fontbox-1.8.8.jar" />
+    	<pathelement location="${lib}/fontbox-1.8.9.jar" />
         <pathelement location="${lib}/geronimo-stax-api_1.0_spec-1.0.1.jar" />
         <pathelement location="${lib}/guava-18.0.jar" />
         <pathelement location="${lib}/htmllexer.jar" />
@@ -185,7 +185,7 @@
     	<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
     	<pathelement location="${lib}/jcifs-1.3.17.jar" />
     	<pathelement location="${lib}/jcl-over-slf4j-1.7.9.jar" />
-    	<pathelement location="${lib}/jempbox-1.8.8" />
+    	<pathelement location="${lib}/jempbox-1.8.9.jar" />
         <pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
         <pathelement location="${lib}/jetty-client-9.2.10.v20150310.jar" />
         <pathelement location="${lib}/jetty-continuation-9.2.10.v20150310.jar" />
@@ -223,7 +223,7 @@
     	<pathelement location="${lib}/metadata-extractor-2.7.0.jar" />
     	<pathelement location="${lib}/noggit-0.5.jar" />
     	<pathelement location="${lib}/org.restlet.jar" />
-        <pathelement location="${lib}/pdfbox-1.8.8.jar" />
+        <pathelement location="${lib}/pdfbox-1.8.9.jar" />
     	<pathelement location="${lib}/poi-3.10.1.jar" />
     	<pathelement location="${lib}/poi-scratchpad-3.10.1.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.9.jar" />
diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html
index 00d2c9734..2b696c46a 100644
--- a/htroot/ConfigSearchPage_p.html
+++ b/htroot/ConfigSearchPage_p.html
@@ -96,6 +96,12 @@
                           </div>
                         </td>
                       </tr>
+                      <tr>
+                          <td><input type="checkbox" name="search.navigation.location" value="true" #(search.navigation.location)#::checked="checked" #(/search.navigation.location)# /></td>
+                          <td><ul class="nav nav-sidebar menugroup" id="sidebarLocation" style="padding-left:15px; padding-right:10px;">
+                                <li><h3>Location</h3></li>
+                          </ul></td>
+                      </tr>                          
                       <tr>
                         <td><input type="checkbox" name="search.navigation.protocol" value="true" #(search.navigation.protocol)#::checked="checked" #(/search.navigation.protocol)# /></td>
                         <td><ul class="nav nav-sidebar menugroup" id="sidebarProtocols" style="padding-left:15px; padding-right:10px;">
diff --git a/htroot/ConfigSearchPage_p.java b/htroot/ConfigSearchPage_p.java
index c7d578f51..925764aa4 100644
--- a/htroot/ConfigSearchPage_p.java
+++ b/htroot/ConfigSearchPage_p.java
@@ -35,6 +35,7 @@ import net.yacy.cora.date.GenericFormatter;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.util.ConcurrentLog;
 import net.yacy.data.WorkTables;
+import net.yacy.document.LibraryProvider;
 import net.yacy.search.Switchboard;
 import net.yacy.search.SwitchboardConstants;
 import net.yacy.server.serverObjects;
@@ -80,6 +81,7 @@ public class ConfigSearchPage_p {
 
                 // construct navigation String
                 String nav = "";
+                if (post.getBoolean("search.navigation.location")) nav += "location,";
                 if (post.getBoolean("search.navigation.filetype")) nav += "filetype,";
                 if (post.getBoolean("search.navigation.protocol")) nav += "protocol,";
                 if (post.getBoolean("search.navigation.hosts")) nav += "hosts,";
@@ -159,6 +161,7 @@ public class ConfigSearchPage_p {
         prop.put("search.result.show.proxy", sb.getConfigBool("search.result.show.proxy", false) ? 1 : 0);
         prop.put("search.result.show.hostbrowser", sb.getConfigBool("search.result.show.hostbrowser", false) ? 1 : 0);
 
+        prop.put("search.navigation.location", sb.getConfig("search.navigation", "").indexOf("location",0) >= 0 ? 1 : 0);
         prop.put("search.navigation.filetype", sb.getConfig("search.navigation", "").indexOf("filetype",0) >= 0 ? 1 : 0);
         prop.put("search.navigation.protocol", sb.getConfig("search.navigation", "").indexOf("protocol",0) >= 0 ? 1 : 0);
         prop.put("search.navigation.hosts", sb.getConfig("search.navigation", "").indexOf("hosts",0) >= 0 ? 1 : 0);
diff --git a/htroot/DictionaryLoader_p.java b/htroot/DictionaryLoader_p.java
index 58c056a09..fd28c866a 100644
--- a/htroot/DictionaryLoader_p.java
+++ b/htroot/DictionaryLoader_p.java
@@ -60,6 +60,9 @@ public class DictionaryLoader_p {
             prop.put(dictionary.nickname + "ActionActivated", 0);
             prop.put(dictionary.nickname + "ActionDeactivated", 0);
         }
+        if (SynonymLibrary.size() > 0) { // status of SynonymLibrary not included in above
+            prop.put("syn0Status", 1);
+        }
 
         if (post == null) {
             return prop;
@@ -76,6 +79,8 @@ public class DictionaryLoader_p {
                 LibraryProvider.autotagging.addPlaces(LibraryProvider.geoLoc);
                 prop.put("geon0Status", LibraryProvider.Dictionary.GEON0.file().exists() ? 1 : 0);
                 prop.put("geon0ActionLoaded", 1);
+                final String nav = sb.getConfig("search.navigation", "");
+                if (nav.indexOf("location") < 0) sb.setConfig("search.navigation", "location,"+nav);
             } catch (final MalformedURLException e) {
                 ConcurrentLog.logException(e);
                 prop.put("geon0ActionLoaded", 2);
@@ -118,6 +123,8 @@ public class DictionaryLoader_p {
                 LibraryProvider.autotagging.addPlaces(LibraryProvider.geoLoc);
                 prop.put("geon1Status", LibraryProvider.Dictionary.GEON1.file().exists() ? 1 : 0);
                 prop.put("geon1ActionLoaded", 1);
+                final String nav = sb.getConfig("search.navigation", "");
+                if (nav.indexOf("location") < 0) sb.setConfig("search.navigation", "location,"+nav);
             } catch (final MalformedURLException e) {
                 ConcurrentLog.logException(e);
                 prop.put("geon1ActionLoaded", 2);
@@ -160,6 +167,8 @@ public class DictionaryLoader_p {
                 LibraryProvider.autotagging.addPlaces(LibraryProvider.geoLoc);
                 prop.put("geon2Status", LibraryProvider.Dictionary.GEON2.file().exists() ? 1 : 0);
                 prop.put("geon2ActionLoaded", 1);
+                final String nav = sb.getConfig("search.navigation", "");
+                if (nav.indexOf("location") < 0) sb.setConfig("search.navigation", "location,"+nav);
             } catch (final MalformedURLException e) {
                 ConcurrentLog.logException(e);
                 prop.put("geon2ActionLoaded", 2);
@@ -203,6 +212,8 @@ public class DictionaryLoader_p {
                 LibraryProvider.autotagging.addPlaces(LibraryProvider.geoLoc);
                 prop.put("geo1Status", LibraryProvider.Dictionary.GEODB1.file().exists() ? 1 : 0);
                 prop.put("geo1ActionLoaded", 1);
+                final String nav = sb.getConfig("search.navigation", "");
+                if (nav.indexOf("location") < 0) sb.setConfig("search.navigation", "location,"+nav);
             } catch (final MalformedURLException e) {
                 ConcurrentLog.logException(e);
                 prop.put("geo1ActionLoaded", 2);
diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java
index ead131365..8a6b1137f 100644
--- a/htroot/yacysearchtrailer.java
+++ b/htroot/yacysearchtrailer.java
@@ -530,9 +530,9 @@ public class yacysearchtrailer {
         }
 
         // category: location search
-        // show only if there is a location database present and if there had been any search results
-        if ((LibraryProvider.geoLoc.isEmpty() || theSearch.getResultCount() == 0) &&
-            (theSearch.locationNavigator == null || theSearch.locationNavigator.isEmpty())) {
+        // show only if active and there is a location database present or if there had been any search results (with lat/lon)
+        if (theSearch.locationNavigator == null
+                || ((LibraryProvider.geoLoc.isEmpty() || theSearch.getResultCount() == 0) && theSearch.locationNavigator.isEmpty())) {
             prop.put("cat-location", 0);
         } else {
             prop.put("cat-location", 1);
diff --git a/lib/fontbox-1.8.8.License b/lib/fontbox-1.8.9.License
similarity index 100%
rename from lib/fontbox-1.8.8.License
rename to lib/fontbox-1.8.9.License
diff --git a/lib/fontbox-1.8.8.jar b/lib/fontbox-1.8.9.jar
similarity index 89%
rename from lib/fontbox-1.8.8.jar
rename to lib/fontbox-1.8.9.jar
index 36fc82a64..05062f156 100644
Binary files a/lib/fontbox-1.8.8.jar and b/lib/fontbox-1.8.9.jar differ
diff --git a/lib/jempbox-1.8.8.License b/lib/jempbox-1.8.9.License
similarity index 100%
rename from lib/jempbox-1.8.8.License
rename to lib/jempbox-1.8.9.License
diff --git a/lib/jempbox-1.8.8.jar b/lib/jempbox-1.8.9.jar
similarity index 77%
rename from lib/jempbox-1.8.8.jar
rename to lib/jempbox-1.8.9.jar
index c4490336f..29c35d073 100644
Binary files a/lib/jempbox-1.8.8.jar and b/lib/jempbox-1.8.9.jar differ
diff --git a/lib/pdfbox-1.8.8.License b/lib/pdfbox-1.8.9.License
similarity index 100%
rename from lib/pdfbox-1.8.8.License
rename to lib/pdfbox-1.8.9.License
diff --git a/lib/pdfbox-1.8.8.jar b/lib/pdfbox-1.8.9.jar
similarity index 91%
rename from lib/pdfbox-1.8.8.jar
rename to lib/pdfbox-1.8.9.jar
index 9a1dfdb2d..9b82e73ee 100644
Binary files a/lib/pdfbox-1.8.8.jar and b/lib/pdfbox-1.8.9.jar differ
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 91b62546b..222d1f781 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -83,7 +83,7 @@
             <compilation-unit>
                 <package-root>source</package-root>
                 <package-root>htroot</package-root>
-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.9.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.jar;lib/httpmime-4.4.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.10.v20150310.jar;lib/jetty-continuation-9.2.10.v20150310.jar;lib/jetty-deploy-9.2.10.v20150310.jar;lib/jetty-http-9.2.10.v20150310.jar;lib/jetty-io-9.2.10.v20150310.jar;lib/jetty-jmx-9.2.10.v20150310.jar;lib/jetty-proxy-9.2.10.v20150310.jar;lib/jetty-security-9.2.10.v20150310.jar;lib/jetty-server-9.2.10.v20150310.jar;lib/jetty-servlet-9.2.10.v20150310.jar;lib/jetty-servlets-9.2.10.v20150310.jar;lib/jetty-util-9.2.10.v20150310.jar;lib/jetty-webapp-9.2.10.v20150310.jar;lib/jetty-xml-9.2.10.v20150310.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.9.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.jar;lib/httpmime-4.4.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.9.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.10.v20150310.jar;lib/jetty-continuation-9.2.10.v20150310.jar;lib/jetty-deploy-9.2.10.v20150310.jar;lib/jetty-http-9.2.10.v20150310.jar;lib/jetty-io-9.2.10.v20150310.jar;lib/jetty-jmx-9.2.10.v20150310.jar;lib/jetty-proxy-9.2.10.v20150310.jar;lib/jetty-security-9.2.10.v20150310.jar;lib/jetty-server-9.2.10.v20150310.jar;lib/jetty-servlet-9.2.10.v20150310.jar;lib/jetty-servlets-9.2.10.v20150310.jar;lib/jetty-util-9.2.10.v20150310.jar;lib/jetty-webapp-9.2.10.v20150310.jar;lib/jetty-xml-9.2.10.v20150310.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
                 <built-to>lib/yacycore.jar</built-to>
                 <source-level>1.7</source-level>
             </compilation-unit>
diff --git a/pom.xml b/pom.xml
index a2ee79535..b158344d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,14 @@
                 <version>2.6.1</version>
                 <configuration>
                     <filesets>
+                        <!-- clean htroot servlet classes -->
+                        <fileset>
+                            <directory>htroot</directory>
+                            <includes>
+                                <include>**/*.class</include>
+                            </includes>
+                        </fileset>
+                        <!-- clean test data -->
                         <fileset>
                             <directory>test/DATA</directory>
                         </fileset>
@@ -137,16 +145,18 @@
            <!-- compile htroot -->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
                 <executions>
                     <execution>
                         <id>compile-htroot</id>
                         <phase>compile</phase>
                         <configuration>
                             <target>
-                                <javac fork="true"  srcdir="htroot/"
+                                <javac fork="true"  srcdir="htroot"
                                        excludes="processing/**"
-                                       includeantruntime="false">
+                                       source="${maven.compiler.source}" target="${maven.compiler.target}"
+                                       debug="true" debuglevel="lines,vars,source" 
+                                       includeantruntime="false" encoding="UTF-8">
                                     <classpath refid="maven.compile.classpath"/>
                                     <compilerarg value="-Xlint"/>
                                 </javac>
@@ -356,7 +366,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>fontbox</artifactId>
-            <version>1.8.8</version>
+            <version>1.8.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -416,7 +426,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>jempbox</artifactId>
-            <version>1.8.8</version>
+            <version>1.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -506,7 +516,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>1.8.8</version>
+            <version>1.8.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
diff --git a/source/net/yacy/http/AbstractRemoteHandler.java b/source/net/yacy/http/AbstractRemoteHandler.java
index 79fa21fa3..8929a5e36 100644
--- a/source/net/yacy/http/AbstractRemoteHandler.java
+++ b/source/net/yacy/http/AbstractRemoteHandler.java
@@ -26,8 +26,8 @@ package net.yacy.http;
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.StringTokenizer;
 
 import javax.servlet.ServletException;
@@ -50,7 +50,7 @@ import org.eclipse.jetty.server.Request;
 abstract public class AbstractRemoteHandler extends ConnectHandler implements Handler {
 	
     protected Switchboard sb = null;
-    private final List<String> localVirtualHostNames = new LinkedList<String>(); // list for quick check for req to local peer
+    private final Set<String> localVirtualHostNames = new HashSet<String>(); // list for quick check for req to local peer
     
     @Override
     protected void doStart() throws Exception {
@@ -76,7 +76,7 @@ abstract public class AbstractRemoteHandler extends ConnectHandler implements Ha
                     }
                 }
                 if (sb.peers != null) {
-                    localVirtualHostNames.add(sb.peers.mySeed().getIP());
+                    localVirtualHostNames.addAll(sb.peers.mySeed().getIPs());
                     localVirtualHostNames.add(sb.peers.myAlternativeAddress()); // add the "peername.yacy" address
                     localVirtualHostNames.add(sb.peers.mySeed().getHexHash() + ".yacyh"); // bugfix by P. Dahl
                 }