diff --git a/module/product/control.php b/module/product/control.php
index a48330ae20..4592341ed0 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -372,7 +372,7 @@ class product extends control
             $moduleName = $tab == 'program'? 'program' : $this->moduleName;
             $methodName = $tab == 'program'? 'product' : 'browse';
             $param      = $tab == 'program' ? "programID=$programID" : "productID=$productID";
-            $locate     = $this->createLink($moduleName, $methodName, $param);
+            $locate     = isonlybody() ? 'parent' : $this->createLink($moduleName, $methodName, $param);
             if($tab == 'doc') $locate = $this->createLink('doc', 'objectLibs', 'type=product');
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 3f1917e11a..f17ea6990f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -54,22 +54,22 @@ class upgradeModel extends model
         foreach($this->config->upgrade->proVersion as $pro => $open)
         {
             if(!isset($versions[$open])) continue;
-            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $edition == 'pro') $versions[$open]['pro'][] = $pro;
+            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'pro') $versions[$open]['pro'][] = $pro;
         }
         foreach($this->config->upgrade->bizVersion as $biz => $open)
         {
             if(!isset($versions[$open])) continue;
-            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $edition == 'biz') $versions[$open]['biz'][] = $biz;
+            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'biz') $versions[$open]['biz'][] = $biz;
         }
         foreach($this->config->upgrade->maxVersion as $max => $open)
         {
             if(!isset($versions[$open])) continue;
-            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $edition == 'max') $versions[$open]['max'][] = $max;
+            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'max') $versions[$open]['max'][] = $max;
         }
 
         /* If the 'current openVersion' is not equal the 'from openVersion', must update structure. */
         $currentVersion  = str_replace('.', '_', $this->config->version);
-        $updateStructure = $openVersion != $this->config->upgrade->{$this->config->edition . 'Version'}[$currentVersion];
+        $updateStructure = $openVersion != ($this->config->edition == 'open' ? $currentVersion : $this->config->upgrade->{$this->config->edition . 'Version'}[$currentVersion]);
 
         /* Execute. */
         foreach($versions as $openVersion => $chargedVersions)
@@ -598,9 +598,7 @@ class upgradeModel extends model
     public function getConfirm($fromVersion)
     {
         $confirmContent = '';
-
-        $openVersion     = $fromVersion;
-        $confirmContent .= $this->getOpenConfirm($openVersion, $fromVersion);
+        $openVersion    = $fromVersion;
 
         if($fromVersion[0] == 'p')
         {
@@ -626,6 +624,7 @@ class upgradeModel extends model
             $confirmContent .= $this->getMaxConfirm($fromVersion);
         }
 
+        $confirmContent = $this->getOpenConfirm($openVersion, $fromVersion) . $confirmContent;
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }