diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_mobile.json b/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_mobile.json
index 420812e0a96c248b02689dfcd0692fb91b43df70..e774ccb83e96acc01bc785c3ef1ae22febcc9e1c 100644
--- a/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_mobile.json
+++ b/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_mobile.json
@@ -18,10 +18,30 @@
         "html": ""
       },
       "events": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
         "postLoad": {
           "code": "",
           "html": ""
         },
+        "load": {
+          "code": "",
+          "html": ""
+        },
         "afterLoad": {
           "code": "",
           "html": ""
@@ -66,10 +86,6 @@
           "code": "",
           "html": ""
         },
-        "load": {
-          "code": "",
-          "html": ""
-        },
         "unload": {
           "code": "",
           "html": ""
diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_edit.json b/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_edit.json
index 37cd5140c0ca69d8cbe4e1990afbf0236f1b0a05..4b17466a0847cafabf3a2c034ddb84082efd1dd9 100644
--- a/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_edit.json
+++ b/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_edit.json
@@ -18,10 +18,30 @@
         "html": ""
       },
       "events": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
         "postLoad": {
           "code": "",
           "html": ""
         },
+        "load": {
+          "code": "",
+          "html": ""
+        },
         "afterLoad": {
           "code": "",
           "html": ""
@@ -50,10 +70,6 @@
           "code": "",
           "html": ""
         },
-        "load": {
-          "code": "",
-          "html": ""
-        },
         "unload": {
           "code": "",
           "html": ""
diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_read.json b/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_read.json
index cb9e797c5d2118b999b1cc0452068afbed8442df..02df20cdbed7695d559118191fdfba5578616dd8 100644
--- a/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_read.json
+++ b/o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_read.json
@@ -18,11 +18,33 @@
         "html": ""
       },
       "events": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
         "postLoad": {
           "code": "",
           "html": ""
         },
+        "load": {
+          "code": "",
+          "html": ""
+        },
         "afterLoad": {
+          "code": "",
+          "html": ""
         },
         "beforeSave": {
           "code": "",
@@ -48,10 +70,6 @@
           "code": "",
           "html": ""
         },
-        "load": {
-          "code": "",
-          "html": ""
-        },
         "unload": {
           "code": "",
           "html": ""
diff --git a/o2web/source/x_component_cms_Xform/Readerfield.js b/o2web/source/x_component_cms_Xform/Readerfield.js
index 15c601153cecb53c7cc5de0fd8fcb6e9752e5502..ca7a7068c135bce0c1c341c7ef4c1132a348b224 100644
--- a/o2web/source/x_component_cms_Xform/Readerfield.js
+++ b/o2web/source/x_component_cms_Xform/Readerfield.js
@@ -29,6 +29,9 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
                     ev.stopPropagation();
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
                 }.bind(this)
             });
         }
@@ -194,7 +197,10 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
         if (this.json.showIcon!='no') this.iconNode = new Element("div", {
             "styles": this.form.css[this.iconStyle],
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
             }
         }).inject(this.node, "before");
 
@@ -232,7 +238,11 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 		if( !this.readonly ) {
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
-				"click": this.clickSelect.bind(this)
+				"click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
 			});
 			if (this.json.showIcon!='no')this.iconNode = new Element("div", {  //this.form.css[this.iconStyle],
 				"styles": {
@@ -245,7 +255,11 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 			if (this.iconNode){
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 });
 			}
 		}
diff --git a/o2web/source/x_component_process_Xform/Org.js b/o2web/source/x_component_process_Xform/Org.js
index aaf33b24984cf10e5a1fc98ab8b2414a063e7315..9135e2dbcb826d6441f148e1625ce758eaef9bfa 100644
--- a/o2web/source/x_component_process_Xform/Org.js
+++ b/o2web/source/x_component_process_Xform/Org.js
@@ -52,7 +52,10 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
                     ev.stopPropagation();
-                }.bind(this)
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
+                }
             });
         }
     },
@@ -545,7 +548,11 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
@@ -582,14 +589,22 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             "id": this.json.id,
             "MWFType": this.json.type,
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
             }
         });
         if (this.json.showIcon!='no' && !this.form.json.hideModuleIcon) {
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
diff --git a/o2web/source/x_component_process_Xform/Orgfield.js b/o2web/source/x_component_process_Xform/Orgfield.js
index f565a1f50f20b84e8358972071fe962a25e98917..84559b8ade4acb4610b99b9611fe0b0d9639252e 100644
--- a/o2web/source/x_component_process_Xform/Orgfield.js
+++ b/o2web/source/x_component_process_Xform/Orgfield.js
@@ -29,7 +29,10 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
                     ev.stopPropagation();
-                }.bind(this)
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
+                }
             });
         }
     },
@@ -196,7 +199,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
@@ -237,7 +244,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 		if( !this.readonly ) {
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
-				"click": this.clickSelect.bind(this)
+				"click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
 			});
             if (this.json.showIcon!='no' && !this.form.json.hideModuleIcon) {
                 this.iconNode = new Element("div", {  //this.form.css[this.iconStyle],
@@ -254,7 +265,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             if (this.iconNode){
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 });
 			}
 
diff --git a/o2web/source/x_component_process_Xform/Personfield.js b/o2web/source/x_component_process_Xform/Personfield.js
index d9fabc293b0394773e0a0a99a0c34e5273e26504..e2fc6cee0ace314442fb259936905af54a6db720 100644
--- a/o2web/source/x_component_process_Xform/Personfield.js
+++ b/o2web/source/x_component_process_Xform/Personfield.js
@@ -52,7 +52,10 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
                     ev.stopPropagation();
-                }.bind(this)
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
+                }
             });
         }
     },
@@ -521,7 +524,11 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
@@ -558,13 +565,21 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             "id": this.json.id,
             "MWFType": this.json.type,
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
             }
         });
         if (this.json.showIcon!='no' && !this.form.json.hideModuleIcon) this.iconNode = new Element("div", {
             "styles": this.form.css[this.iconStyle],
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
             }
         }).inject(this.node, "before");