diff --git a/CHANGELOG b/CHANGELOG
index 21256b71569ff2512dc6f0276d9927c81926b0cc..08060170f48586d6f1f08de22b0f2397d31f3aab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+minerva (11.0.8) stable; urgency=medium
+  * Bug fix: XSS vulnerability
+  * Bug fix: "java.lang.IllegalStateException: getWriter()" exceptions
+    in logs
+  * Bug fix: crash for uploading and caching chemical data
+  * Bug fix: disappearing tiles in submodels
+  * Bug fix: max number of results is properly taken from configuration
+  * Bug fix: overlay cannot be hidden before process of fetching data
+    during opening is finished
+  * Bug fix: redirection to login page when session expired and access to
+    export page is requested
+  * Bug fix: sometimes overlays couldn't be hidden in submaps
+  
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 05 Feb 2018 18:00:00 +0200
+  
 minerva (11.0.7) stable; urgency=medium
   * Bug fix: redirection added when anonymous tries to access secured map
   * Bug fix: loading time of custom overlays is reduced
diff --git a/persist/src/db/11.0.8/fix_db_20180118.sql b/persist/src/db/11.0.8/fix_db_20180118.sql
new file mode 100644
index 0000000000000000000000000000000000000000..a33b6ad89d4881c84fb355b8c56d309760e66b70
--- /dev/null
+++ b/persist/src/db/11.0.8/fix_db_20180118.sql
@@ -0,0 +1 @@
+-- empty file to force directory to be commited to git repo
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index a43617e524ad51c00cc84611bdbf4122d9a5e86f..2c2e2c8b85f16344550cbaac6ff5482a76560f0d 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="MapViewer-web">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="service-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-service/MapViewer-service">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="model-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-model/MapViewer-model">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="commons-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-commons/MapViewer-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="persist-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-persist/MapViewer-persist">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="model-command-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-model-command/MapViewer-model-command">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="annotation-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-annotation/MapViewer-annotation">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="converter-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-converter/MapViewer-converter">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="converter-CellDesigner-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-converter-CellDesigner/MapViewer-converter-CellDesigner">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="converter-SBGNML-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-converter-SBGNML/MapViewer-converter-SBGNML">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="converter-graphics-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-converter-graphics/MapViewer-converter-graphics">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="rest-api-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MapViewer-rest-api/MapViewer-rest-api">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="frontend-js-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/frontend-js/frontend-js">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="java-output-path" value="/MapViewer-web/target/classes"/>
-        <property name="context-root" value="web"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="MapViewer-web">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="service-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/service/service">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="model-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/model/model">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="commons-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/commons/commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="persist-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/persist/persist">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="model-command-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/model-command/model-command">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="annotation-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/annotation/annotation">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="converter-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/converter/converter">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="converter-CellDesigner-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/converter-CellDesigner/converter-CellDesigner">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="converter-SBGNML-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/converter-SBGNML/converter-SBGNML">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="converter-graphics-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/converter-graphics/converter-graphics">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="rest-api-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rest-api/rest-api">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="frontend-js-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/frontend-js/frontend-js">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="java-output-path" value="/MapViewer-web/target/classes"/>
+        <property name="context-root" value="web"/>
+    </wb-module>
+</project-modules>