diff --git a/module/bug/control.php b/module/bug/control.php
index 67c30f079a..741913b13d 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -73,7 +73,7 @@ class bug extends control
                 $products = $this->product->getPairs($mode, 0, '', 'all');
             }
 
-            if(empty($products) and !helper::isAjaxRequest()) $this->locate($this->createLink('product', 'showErrorNone', "moduleName=$tab&activeMenu=bug&objectID=$objectID"));
+            if(empty($products) and substr($this->app->rawMethod, 0, 4) != 'ajax') $this->locate($this->createLink('product', 'showErrorNone', "moduleName=$tab&activeMenu=bug&objectID=$objectID"));
         }
         else
         {
diff --git a/module/product/ui/showerrornone.html.php b/module/product/ui/showerrornone.html.php
index efd1acadaf..320950e530 100644
--- a/module/product/ui/showerrornone.html.php
+++ b/module/product/ui/showerrornone.html.php
@@ -42,7 +42,7 @@ div
     (
         setClass('btn ghost text-primary'),
         set::href($link),
-        set('data-app', $app->tab),
+        setData('app', $tab),
         icon('plus'),
         $text
     )
diff --git a/module/product/zen.php b/module/product/zen.php
index 6a57bcb75e..ffa9b85d43 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -530,10 +530,10 @@ class productZen extends product
         $moduleName = $tab == 'program' ? 'program' : $this->moduleName;
         $methodName = $tab == 'program' ? 'product' : 'browse';
         $param      = $tab == 'program' ? "programID=$programID" : "productID=$productID";
-        $location   = isonlybody() ? 'true' : $this->createLink($moduleName, $methodName, $param);
+        $location   = isInModal() ? 'true' : $this->createLink($moduleName, $methodName, $param);
         if($tab == 'doc') $location = $this->createLink('doc', 'productSpace', "objectID=$productID");
 
-        return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $location);
+        return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $location, 'closeModal' => true);
     }
 
     /**