diff --git a/src/module_vm4ms/web_service/sql/sqlQueries.xml b/src/module_vm4ms/web_service/sql/sqlQueries.xml
index 93d8693fe485ea72c80b67a5b47b711e9252cfed..7d2865b5895e8fe15a54b672e0410e420c9c7e09 100644
--- a/src/module_vm4ms/web_service/sql/sqlQueries.xml
+++ b/src/module_vm4ms/web_service/sql/sqlQueries.xml
@@ -3650,5 +3650,15 @@
 				]]>
 			</code>
 		</query>
+		<query>
+			<type>update</type>
+			<version>2019.01.00</version>
+			<code>
+				<![CDATA[
+				-- Frédéric 17/01/2019 14:55
+				ALTER TABLE s_vm4ms.connection ALTER COLUMN server TYPE character varying(100);
+				]]>
+			</code>
+		</query>
 	</queriesCollection>
 </sqlQueries>
diff --git a/src/module_vmap/module/javascript/app/vmap/tools/print.js b/src/module_vmap/module/javascript/app/vmap/tools/print.js
index a4da24b2226efaebd24a242eb9e0ac342265eb0e..70d38801732b5d7990ce0aba1d270b022a8d15e9 100644
--- a/src/module_vmap/module/javascript/app/vmap/tools/print.js
+++ b/src/module_vmap/module/javascript/app/vmap/tools/print.js
@@ -530,6 +530,12 @@ nsVmap.nsToolsManager.Print.prototype.printController.prototype.changeScale = fu
     // Change la résolution en fonction de l'échelle
     oVmap.getMap().setScale(viewScale);
 
+    // Change l'échalle de la carte comparée si besoin
+    if(this.$scope_["$root"]["compare_enabled"]) {
+        setTimeout(function () {
+            oVmap.getMapCompare().setScale(oVmap.getMap().getScale());
+        });
+    }
 };
 
 /**
diff --git a/src/vitis/client/css/icons/style.css b/src/vitis/client/css/icons/style.css
index 90f70bd022f65b24335883a7fcdd899db7d42c7a..995a6b2a6d7272a2ba770be7f7a77f7e31dae74b 100644
--- a/src/vitis/client/css/icons/style.css
+++ b/src/vitis/client/css/icons/style.css
@@ -596,6 +596,9 @@
 .icon-language1:before {
   content: "\e2a8";
 }
+.icon-vm4vmp:before {
+  content: "\e2a8";
+}
 .icon-layers:before {
   content: "\e1d3";
 }
diff --git a/src/vitis/client/javascript/externs/mapJSON/MapJSON.js b/src/vitis/client/javascript/externs/mapJSON/MapJSON.js
index 0d98c0487f4de44920d87be6070a95f0702f16da..1f631eb3536f9f76a3bd0b8a29c2a790df270b98 100755
--- a/src/vitis/client/javascript/externs/mapJSON/MapJSON.js
+++ b/src/vitis/client/javascript/externs/mapJSON/MapJSON.js
@@ -597,8 +597,11 @@ MapJSON.prototype.getLayerFromLayerDef_ = function (oMapDefinition, oLayerDef, o
     }
     if (goog.isDefAndNotNull(oLayerDef['is_filtered'])) {
         if (goog.isDefAndNotNull(oLayerDef['filter_form'])) {
-            if (goog.isString(oLayerDef['filter_form']) && oLayerDef['filter_form'].length !== 0) {
-                oLayerDef['filter_form'] = JSON.parse(oLayerDef['filter_form']);
+            if ((goog.isString(oLayerDef['filter_form']) && oLayerDef['filter_form'].length !== 0) ||
+                goog.isObject(oLayerDef['filter_form'])) {
+                if (goog.isString(oLayerDef['filter_form'])) {
+                    oLayerDef['filter_form'] = JSON.parse(oLayerDef['filter_form']);
+                }
                 oLayerDef['filter_values'] = this.getFilterFormValues_(oLayerDef['filter_form']);
                 layer.set('filter_form', oLayerDef['filter_form']);
                 layer.set('filter_form_embedjs', oLayerDef['filter_form_embedjs']);