diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index e757b5ed..4a77d6f0 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -82,6 +82,9 @@ admin.user = admin@wisemapping.org
 # Site URL. This url will be used during sharing emails and public views.
 site.baseurl = http://localhost:8080
 
+# Site Homepage URL. This will be used as URL for homepage location.
+site.homepage = c/home
+
 ##################################################################################
 # Google Analytics Settings
 ##################################################################################
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index 4d999cfb..b150a358 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -47,6 +47,8 @@
                 <map>
                     <entry key="google.analytics.enabled" value="${google.analytics.enabled}"/>
                     <entry key="google.analytics.account" value="${google.analytics.account}"/>
+                    <entry key="google.ads.enabled" value="${google.ads.enabled}"/>
+                    <entry key="site.homepage" value="${site.homepage}"/>
                 </map>
             </property>
         </bean>
diff --git a/wise-webapp/src/main/webapp/index.html b/wise-webapp/src/main/webapp/index.html
index ad1662cb..02dcf806 100644
--- a/wise-webapp/src/main/webapp/index.html
+++ b/wise-webapp/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-    <meta HTTP-EQUIV="REFRESH" content="0; url=c/home">
+    <meta HTTP-EQUIV="REFRESH" content="0; url=c/maps/">
 </head>
 </html>
diff --git a/wise-webapp/src/main/webapp/index.jsp b/wise-webapp/src/main/webapp/index.jsp
index f5c10307..a444398c 100644
--- a/wise-webapp/src/main/webapp/index.jsp
+++ b/wise-webapp/src/main/webapp/index.jsp
@@ -1,3 +1,3 @@
 <%
-    response.sendRedirect("c/home");
+    response.sendRedirect("c/maps/");
 %>
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp
index bd23ff41..0564d167 100644
--- a/wise-webapp/src/main/webapp/jsp/header.jsp
+++ b/wise-webapp/src/main/webapp/jsp/header.jsp
@@ -53,7 +53,7 @@
 </div>
 <c:if test="${param.onlyActionHeader!=true}">
     <div id="headerContent">
-        <a href="c/home" title="Homepage">
+        <a href="${requestScope['site.homepage']}" title="Homepage">
             <div id="headerLogo">&nbsp;</div>
         </a>
 
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 36ea5967..6b211674 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -77,7 +77,7 @@
                         code="REGISTER"/></a></span>
             </c:if>
         </div>
-        <a href="c/maps/">
+        <a href="${requestScope['site.homepage']}">
             <div id="headerLogo"></div>
         </a>
 
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
index 0ddbff91..5fafa58a 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
@@ -70,7 +70,7 @@
     <div id="mindplot" onselectstart="return false;"></div>
 
     <div id="embFooter">
-        <a href="c/home" target="new">
+        <a href="${requestScope['site.homepage']}" target="new">
             <div id="footerLogo"></div>
         </a>
 
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
index 541537a7..dfd0df63 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -105,7 +105,7 @@
     <div id="printLogo"></div>
 
     <div id="embFooter">
-        <a href="c/home" target="new">
+        <a href="${requestScope['site.homepage']}" target="new">
             <div id="footerLogo"></div>
         </a>
 
diff --git a/wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm b/wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm
new file mode 100644
index 00000000..b1035fd0
--- /dev/null
+++ b/wise-webapp/src/test/resources/data/freemind/XMLcharacter.mm
@@ -0,0 +1,78 @@
+<Server pot="8005" shutdown="0fbb9iaebcbfbef203eca71b6be367859">
+
+    <Service name="Tomcat-Apache">
+
+        <Connector address="127.0.0.1"
+                   port="8009"
+                   minProcessors="5"
+                   maxProcessors="75"
+                   enableLookups="false"
+                   protocol="AJP/1.3"/>
+
+        <Engine name="appserver"
+                defaultHost="wisemapping.com">
+
+            <Host name="wisemapping.com"
+                  appBase="/var/lib/tomcat6/webapps/wisemapping.com/"
+                  autoDeploy="false"
+                  deployOnStartup="false"
+                  unpackWARs="false"
+                  deployXML="false"
+                  debug="0">
+                <Context path=""
+                         docBase="/var/lib/tomcat6/webapps/wisemapping.com/home"
+                         reloadable="false"
+                         debug="true">
+                </Context>
+
+
+            </Host>
+        </Engine>
+
+    </Service>
+
+    <Service name="Tomcat-Apache2">
+
+        <Connector address="127.0.0.1"
+                   port="8010"
+                   minProcessors="5"
+                   maxProcessors="75"
+                   enableLookups="false"
+                   protocol="AJP/1.3"/>
+
+        <Engine name="appserver2"
+                defaultHost="app.wisemapping.com">
+
+            <Host name="app.wisemapping.com"
+                  appBase="/var/lib/tomcat6/webapps/wisemapping.com/app"
+                  autoDeploy="false"
+                  deployOnStartup="false"
+                  unpackWARs="false"
+                  deployXML="false">
+
+                <Context path=""
+                         docBase="/var/lib/tomcat6/webapps/wisemapping.com/app"
+                         reloadable="false">
+
+                    <Resource
+                            name="jdbc/wiseapp"
+                            auth="Container"
+                            type="javax.sql.DataSource"
+                            maxActive="100"
+                            maxIdle="30" maxWait="10000"
+                            username="wiseapp"
+                            password="password"
+                            driverClassName="com.mysql.jdbc.Driver"
+                            url="jdbc:mysql://localhost/wiseapp"
+                            validationQuery="SELECT 1"
+                            testOnBorrow="true"
+                            />
+                </Context>
+
+
+            </Host>
+        </Engine>
+
+    </Service>
+
+</Server>
