diff --git a/db/zentao.sql b/db/zentao.sql
index c2eb4e5475..affac107d4 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -914,7 +914,7 @@ INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES
 (7, 'PD', 'pd', 'for product director.'),
 (8, 'QD', 'qd', 'for quality director.'),
 (9, 'TOP', 'top', 'for top manager.'),
-(10, 'OTHERS', '', 'for others.'),
+(10, 'OTHERS', 'others', 'for others.'),
 (11, 'guest', 'guest', 'For guest'),
 (12, 'limited', 'limited', 'For limited user');
 
diff --git a/module/build/control.php b/module/build/control.php
index c8a5bd1fed..6fe1f9d488 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -346,7 +346,7 @@ class build extends control
         }
         if($varName == 'testTaskBuild')
         {
-            $builds = $this->build->getProjectBuildPairs($projectID, $productID, $branch, 'noempty');
+            $builds = $this->build->getProjectBuildPairs($projectID, $productID, $branch, 'noempty,notrunk');
             if($isJsonView) die(json_encode($builds));
             else die(html::select('build', $builds, $build, "class='form-control'"));
         }
diff --git a/module/project/model.php b/module/project/model.php
index 7b8017f62e..1b6c04c68e 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -342,7 +342,7 @@ class projectModel extends model
                     $member->role    = $this->lang->project->$fieldName;
                     $member->days    = $project->days;
                     $member->hours   = $this->config->project->defaultWorkhours;
-                    $this->dao->insert(TABLE_TEAM)->data($member)->exec();
+                    $this->dao->replace(TABLE_TEAM)->data($member)->exec();
                 }
             }
         }
diff --git a/module/testcase/control.php b/module/testcase/control.php
index de54fe507d..917eae5fa7 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1147,10 +1147,10 @@ class testcase extends control
                 }
 
                 /* fill some field with useful value. */
-                if(isset($products[$case->product]))      $case->product = $products[$case->product] . "(#$case->product)";
-                if(isset($branches[$case->branch]))       $case->branch  = $branches[$case->branch] . "(#$case->branch)";
-                if(isset($relatedModules[$case->module])) $case->module  = $relatedModules[$case->module] . "(#$case->module)";
-                if(isset($relatedStories[$case->story]))  $case->story   = $relatedStories[$case->story] . "(#$case->story)";
+                $case->product = !isset($products[$case->product])     ? '' : $products[$case->product] . "(#$case->product)";
+                $case->branch  = !isset($branches[$case->branch])      ? '' : $branches[$case->branch] . "(#$case->branch)";
+                $case->module  = !isset($relatedModules[$case->module])? '' : $relatedModules[$case->module] . "(#$case->module)";
+                $case->story   = !isset($relatedStories[$case->story]) ? '' : $relatedStories[$case->story] . "(#$case->story)";
 
                 if(isset($caseLang->priList[$case->pri]))              $case->pri           = $caseLang->priList[$case->pri];
                 if(isset($caseLang->typeList[$case->type]))            $case->type          = $caseLang->typeList[$case->type];