diff --git a/module/bug/css/view.css b/module/bug/css/view.css
index d3e4181d63..59cb9d6ffc 100644
--- a/module/bug/css/view.css
+++ b/module/bug/css/view.css
@@ -4,3 +4,4 @@
 .side-col .cell {padding: 0px;}
 .tab-pane table {border: 1px solid #ddd; border-top: none;}
 .btn-edit-comment {z-index: 100;}
+.modal-body {right: 15px;}
diff --git a/module/bug/js/view.js b/module/bug/js/view.js
index 5226a3e3e4..dbef34842b 100644
--- a/module/bug/js/view.js
+++ b/module/bug/js/view.js
@@ -18,7 +18,7 @@ $('#tostory').click(function()
  */
 function loadProductExecutions(productID, projectID)
 {
-    link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID +'&branch=' + branchID + '&number=&executionID=0&from=bugToTask');
+    var link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID +'&branch=' + branchID + '&number=&executionID=0&from=bugToTask');
 
     $('#executionBox').load(link, function()
     {
@@ -41,7 +41,7 @@ $('#toTaskButton').on('click', function()
     else if(systemMode == 'classic' && executionID)
     {
         $('#cancelButton').click();
-        link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=0&bugID=' + bugID);
+        var link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=0&bugID=' + bugID);
         window.parent.$.apps.open(link, 'execution');
     }
     else if(executionID == 0)
diff --git a/module/bug/model.php b/module/bug/model.php
index 870b16e798..251cb0596c 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1619,10 +1619,7 @@ class bugModel extends model
         if($moduleName == 'contributeBug')
         {
             $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, $pager, $orderBy, 0, 'bug');
-            foreach($bugsAssignedByMe as $bugID => $bug)
-            {
-                $bugIDList[$bugID] = $bugID;
-            }
+            foreach($bugsAssignedByMe as $bugID => $bug) $bugIDList[$bugID] = $bugID;
         }
 
         if($queryID)
diff --git a/module/common/model.php b/module/common/model.php
index 9ce8e55520..e2a5804e90 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -46,23 +46,23 @@ class commonModel extends model
     public function syncPPEStatus($objectID)
     {
         global $app;
-        $thisModule = $app->rawModule;
+        $rawModule = $app->rawModule;
 
         if($this->config->systemMode == 'classic')
         {
-            if($thisModule == 'task') $this->syncExecutionStatus($objectID);
+            if($rawModule == 'task') $this->syncExecutionStatus($objectID);
         }
 
         if($this->config->systemMode == 'new')
         {
-            if($thisModule == 'task' or $thisModule == 'effort')
+            if($rawModule == 'task' or $rawModule == 'effort')
             {
                 $taskID    = $objectID;
                 $execution = $this->syncExecutionStatus($taskID);
                 $project   = $this->syncProjectStatus($execution);
                 $this->syncProgramStatus($project);
             }
-            if($thisModule == 'execution')
+            if($rawModule == 'execution')
             {
                 $executionID = $objectID;
                 $execution   = $this->dao->select('id, project, grade, parent')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch();
@@ -70,13 +70,13 @@ class commonModel extends model
                 $project     = $this->syncProjectStatus($execution);
                 $this->syncProgramStatus($project);
             }
-            if($thisModule == 'project')
+            if($rawModule == 'project')
             {
                 $projectID = $objectID;
                 $project   = $this->dao->select('id, parent, path')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch();
                 $this->syncProgramStatus($project);
             }
-            if($thisModule == 'program')
+            if($rawModule == 'program')
             {
                 $programID = $objectID;
                 $program   = $this->dao->select('id, parent, path')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch();
diff --git a/module/doc/model.php b/module/doc/model.php
index 6798d9e23f..7fe3134a2a 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -927,6 +927,7 @@ class docModel extends model
         {
             $this->config->doc->search['module'] = 'contributeDoc';
             $products = $this->product->getPairs();
+
             $this->config->doc->search['params']['project']['values']   = array('' => '') + $this->loadModel('project')->getPairsByProgram() + array('all' => $this->lang->doc->allProjects);
             $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs() + array('all' => $this->lang->doc->allExecutions);
             $this->config->doc->search['params']['lib']['values']       = array('' => '') + $this->loadModel('doc')->getLibs('all', 'withObject') + array('all' => $this->lang->doclib->all);
@@ -940,10 +941,9 @@ class docModel extends model
             $this->config->doc->search['params']['lib']['values']       = array('' => '', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
         }
 
-
-        $this->config->doc->search['actionURL']                     = $actionURL;
-        $this->config->doc->search['queryID']                       = $queryID;
-        $this->config->doc->search['params']['product']['values']   = array('' => '') + $products + array('all' => $this->lang->doc->allProduct);
+        $this->config->doc->search['actionURL']                   = $actionURL;
+        $this->config->doc->search['queryID']                     = $queryID;
+        $this->config->doc->search['params']['product']['values'] = array('' => '') + $products + array('all' => $this->lang->doc->allProduct);
 
         /* Get the modules. */
         $moduleOptionMenu                                        = $this->loadModel('tree')->getOptionMenu($libID, 'doc', $startModuleID = 0);