diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 098598a99..944ab1734 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1357,6 +1357,10 @@ class workspaceTools
         }
 
         if ( !$flag && !is_null($flagFunction) ) {
+            //Replace TYPE by ENGINE
+            $script = file_get_contents($filename);
+            $script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script);
+            file_put_contents($filename,$script);
             $aHost = explode(':',$parameters['dbHost']);
             $dbHost = $aHost[0];
             if(isset($aHost[1])){
diff --git a/workflow/engine/js/controls/variablePicker.js b/workflow/engine/js/controls/variablePicker.js
index c3b39db45..8dac84bd3 100755
--- a/workflow/engine/js/controls/variablePicker.js
+++ b/workflow/engine/js/controls/variablePicker.js
@@ -4,6 +4,7 @@ var setVariablePickerJS = function(){
         if(this.value.substring(0,5) == 'gridt') {
             try {
                 updateEditorContent(this.value.substring(5));
+                closePluginPopup();
             } catch(err) {
                 closePluginPopup();
             }
@@ -21,6 +22,7 @@ var setVariablePickerJS = function(){
           if(element.value.substring(0,5) == 'gridt') { 
             try {
                 updateEditorContent(element.value.substring(5));
+                closePluginPopup();
             } catch(err) {
                 closePluginPopup();
             }
diff --git a/workflow/engine/methods/cases/cases_OpenToRevise.php b/workflow/engine/methods/cases/cases_OpenToRevise.php
index cefc8461d..ac920d716 100755
--- a/workflow/engine/methods/cases/cases_OpenToRevise.php
+++ b/workflow/engine/methods/cases/cases_OpenToRevise.php
@@ -71,6 +71,13 @@ $_SESSION['STEP_POSITION'] = 0;
 
 /* Redirect to next step */
 $aNextStep = $oCase->getNextSupervisorStep( $_SESSION['PROCESS'], 0 );
-$sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE'];
-G::header( 'location: ' . $sPage );
-
+if($aNextStep['UID'] != ''){
+    $sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE'];
+    G::header( 'location: ' . $sPage );
+}else{
+    $aMessage = array ();
+    $aMessage['MESSAGE'] = G::LoadTranslation( 'ID_SUPERVISOR_DOES_NOT_HAVE_DYNAFORMS' );
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publishBlank', 'blank' );
+}
\ No newline at end of file
diff --git a/workflow/engine/skinEngine/neoclassic/css/form.css b/workflow/engine/skinEngine/neoclassic/css/form.css
index 58a553086..5fc8dbfb6 100644
--- a/workflow/engine/skinEngine/neoclassic/css/form.css
+++ b/workflow/engine/skinEngine/neoclassic/css/form.css
@@ -293,6 +293,7 @@ INPUT {
   background-color: black;
   left: 0px;
   top: 0px;
+  height:100% !important;
 }
 .panel_iframe___processmaker {
   width: 100%;
diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js
index a9ff7a662..6292f2ee1 100755
--- a/workflow/engine/templates/cases/open.js
+++ b/workflow/engine/templates/cases/open.js
@@ -1539,7 +1539,7 @@ Ext.onReady(function(){
 	                  TabPanel.setActiveTab(tabId);
 	                }
 	                else {
-	                  if(name == "processMap" && isBrowserIE()){
+	                  if(name == "processMap" && isBrowserIE() && _PROJECT_TYPE === 'bpmn'){
 	                      var windContainer = window.open(uri,"winContainer");
 	                  } else {
 	                      TabPanel.add({