diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm
index 06ce3e8a240..c074b28a4f3 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm
@@ -786,7 +786,7 @@ sub add_tag {
         if (ref $t eq 'ARRAY'){
             push @tags, $_ foreach @$t;
         }
-        push @tags, split(/[\s,]+/, $t);
+        push @tags, split(/,+/, $t);
     }
 
     foreach my $name (@tags){
diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCaseRun.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCaseRun.pm
index d2d4fcd0be2..8942c6302fe 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCaseRun.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCaseRun.pm
@@ -316,7 +316,7 @@ sub to_json {
     $obj->{'type'}         = $self->type;
     $obj->{'id'}           = $self->id;
     $obj->{'sortkey'}      = $self->sortkey;
-    $obj->{'bug_list'}     = $self->case->bug_list;
+    $obj->{'bug_list'}     = $self->bug_list;
     
     return $json->objToJson($obj); 
 }
@@ -939,7 +939,7 @@ sub bug_list {
     return $self->{'bug_list'} if exists $self->{'bug_list'};
     my $dbh = Bugzilla->dbh;
     my @bugs;
-    my $bugids = $dbh->selectcol_arrayref("SELECT bug_id 
+    my $bugids = $dbh->selectcol_arrayref("SELECT DISTINCT bug_id 
                                      FROM test_case_bugs 
                                      WHERE case_run_id=?", 
                                      undef, $self->id);
diff --git a/mozilla/webtools/testopia/testopia/js/caserun.js b/mozilla/webtools/testopia/testopia/js/caserun.js
index dff624c2a71..444ec42a7cf 100755
--- a/mozilla/webtools/testopia/testopia/js/caserun.js
+++ b/mozilla/webtools/testopia/testopia/js/caserun.js
@@ -1236,6 +1236,7 @@ CaseBugsGrid = function(id){
                 ds.load({
                     params: {case_id: tcid}
                 });
+                Ext.getCmp('attachbug').reset();
             },
             failure: testopiaError
         });
diff --git a/mozilla/webtools/testopia/testopia/js/tags.js b/mozilla/webtools/testopia/testopia/js/tags.js
index 28df943e370..c9e9005c8a6 100644
--- a/mozilla/webtools/testopia/testopia/js/tags.js
+++ b/mozilla/webtools/testopia/testopia/js/tags.js
@@ -77,7 +77,7 @@ TestopiaObjectTags = function(obj, obj_id){
     var deleteButton = new Ext.Button({
         icon: 'testopia/img/delete.png',
         iconCls: 'img_button_16x',
-        handler: this.remove
+        handler: this.remove.createDelegate(this)
     });
         
     TestopiaObjectTags.superclass.constructor.call(this, {
diff --git a/mozilla/webtools/testopia/testopia/patch-3.0.x b/mozilla/webtools/testopia/testopia/patch-3.0.x
index 75dfc5f9fa3..42290a59df6 100644
--- a/mozilla/webtools/testopia/testopia/patch-3.0.x
+++ b/mozilla/webtools/testopia/testopia/patch-3.0.x
@@ -327,4 +327,3 @@ diff -u -r1.171.2.2 Bug.pm
  #####################################################################
  # Subroutines
  #####################################################################
-                     
\ No newline at end of file