diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm
index 4d2dd19709b..ca3657a56b1 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm
@@ -823,6 +823,7 @@ sub attach_bug {
     my $self = shift;
     my ($bugids, $caserun_id) = @_;
     my $dbh = Bugzilla->dbh;
+    trick_taint($caserun_id);
     
     $bugids = $self->_check_bugs($bugids, "ATTACH");
     
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/completion.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/completion.html.tmpl
index 24ebd1703b1..42b75780406 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/completion.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/completion.html.tmpl
@@ -71,12 +71,12 @@
     <tr>
       <td>
         <table style="height:200px; cell-padding: 3px; margin-right: 10px; border: 1px solid black">
-          <tr><th class="report_header">Total:</th><td colspan="2" align="center"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]" target="_blank">[% total FILTER none %]</a></td></tr>
-          <tr><th class="report_header">Completed:</th><td class="complete_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&case_run_status=PASSED&case_run_status=FAILED&case_run_status=BLOCKED" target="_blank">[% completed FILTER none %]</a></td><td class="complete_cell">[% percent_completed || 0 FILTER none %]%</td></tr>
-          <tr><th class="report_header">IDLE:</th><td class="idle_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&case_run_status=IDLE" target="_blank">[% idle FILTER none %]</a></td><td class="idle_cell">[% percent_idle  || 0 FILTER none %]%</td></tr>
-          <tr><th class="report_header">PASSED:</th><td class="passed_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&case_run_status=PASSED" target="_blank">[% passed FILTER none %]</a></td><td class="passed_cell">[% percent_passed  || 0 FILTER none %]%</td></tr>
-          <tr><th class="report_header">FAILED:</th><td class="failed_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&case_run_status=FAILED" target="_blank">[% failed FILTER none %]</a></td><td class="failed_cell">[% percent_failed  || 0 FILTER none %]%</td></tr>
-          <tr><th class="report_header">BLOCKED:</th><td class="blocked_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&case_run_status=BLOCKED" target="_blank">[% blocked FILTER none %]</a></td><td class="blocked_cell">[% percent_blocked  || 0 FILTER none %]%</td></tr>
+          <tr><th class="report_header">Total:</th><td colspan="2" align="center"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&isactive=1" target="_blank">[% total FILTER none %]</a></td></tr>
+          <tr><th class="report_header">Completed:</th><td class="complete_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&isactive=1&case_run_status=PASSED&case_run_status=FAILED&case_run_status=BLOCKED" target="_blank">[% completed FILTER none %]</a></td><td class="complete_cell">[% percent_completed || 0 FILTER none %]%</td></tr>
+          <tr><th class="report_header">IDLE:</th><td class="idle_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&isactive=1&case_run_status=IDLE" target="_blank">[% idle FILTER none %]</a></td><td class="idle_cell">[% percent_idle  || 0 FILTER none %]%</td></tr>
+          <tr><th class="report_header">PASSED:</th><td class="passed_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&isactive=1&case_run_status=PASSED" target="_blank">[% passed FILTER none %]</a></td><td class="passed_cell">[% percent_passed  || 0 FILTER none %]%</td></tr>
+          <tr><th class="report_header">FAILED:</th><td class="failed_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&isactive=1&case_run_status=FAILED" target="_blank">[% failed FILTER none %]</a></td><td class="failed_cell">[% percent_failed  || 0 FILTER none %]%</td></tr>
+          <tr><th class="report_header">BLOCKED:</th><td class="blocked_cell"><a href="tr_list_caseruns.cgi?run_id=[% runs FILTER url_quote %]&build_id=[% builds FILTER url_quote %]&isactive=1&case_run_status=BLOCKED" target="_blank">[% blocked FILTER none %]</a></td><td class="blocked_cell">[% percent_blocked  || 0 FILTER none %]%</td></tr>
         </table>
       </td>
       <td><img src="tr_run_reports.cgi?type=bar&t=[% total FILTER none %]&c=[% completed FILTER none %]&p=[% passed FILTER none %]&f=[% failed FILTER none %]&b=[% blocked FILTER none %]"></td>
diff --git a/mozilla/webtools/testopia/testopia/js/caserun.js b/mozilla/webtools/testopia/testopia/js/caserun.js
index 887e47027e3..dff624c2a71 100755
--- a/mozilla/webtools/testopia/testopia/js/caserun.js
+++ b/mozilla/webtools/testopia/testopia/js/caserun.js
@@ -144,7 +144,7 @@ CaseRunListGrid = function(params, cfg){
     this.params = params;
     this.store = new Ext.data.GroupingStore({
         url: 'tr_list_caseruns.cgi',
-        baseParams: {ctype: 'json', isactive:1},
+        baseParams: {ctype: 'json'},
         reader: new Ext.data.JsonReader({
             totalProperty: 'totalResultsAvailable',
             root: 'Result',