diff --git a/webtools/bugzilla/template/en/default/bug/process/confirm-duplicate.html.tmpl b/webtools/bugzilla/template/en/default/bug/process/confirm-duplicate.html.tmpl
index 4703af42679..eb3b82b4ff4 100644
--- a/webtools/bugzilla/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/webtools/bugzilla/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -29,19 +29,19 @@
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
-
 [% PROCESS global/header.html.tmpl title="Duplicate Warning" %]
+[% orig_bug = "$terms.bug $original_bug_id"
+     FILTER bug_link(original_bug_id) %]
 
 <p>
   When marking [% terms.abug %] as a duplicate, the reporter of the duplicate
   is normally added to the CC list of the original. The permissions
-  on [% terms.bug %] [%+ original_bug_id %] (the original) are currently set
+  on [% orig_bug FILTER none %] (the original) are currently set
   such that the reporter would not normally be able to see it.
 </p>
 
 <p>
-  <b>Adding the reporter to the CC list of [% terms.bug %] 
-    [%+ original_bug_id %]
+  <b>Adding the reporter to the CC list of [% orig_bug FILTER none %]
   [% IF cclist_accessible %]
     will immediately
   [% ELSE %]
@@ -57,16 +57,16 @@
 
 <p>
   <input type="radio" name="confirm_add_duplicate" value="1">
-    Yes, add the reporter to CC list on [% terms.bug %] [%+ original_bug_id %]
+    Yes, add the reporter to CC list on [% orig_bug FILTER none %]
 </p>
 <p>
   <input type="radio" name="confirm_add_duplicate" value="0" checked="checked">
-    No, do not add the reporter to CC list on [% terms.bug %] 
-    [%+ original_bug_id %]
+    No, do not add the reporter to CC list on [% orig_bug FILTER none %]
 </p>
 <p>
-  <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
-    and revisit [% terms.bug %] [%+ duplicate_bug_id %]</a>
+  [% "Throw away my changes, and revisit $terms.bug $duplicate_bug_id"
+     FILTER bug_link(duplicate_bug_id) FILTER none %]
+</p>
 <p>
   <input type="submit" id="process" value="Submit">
 </p>
diff --git a/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl b/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
index 620744bf7d8..b66be2ca7c8 100644
--- a/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
+++ b/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
@@ -45,7 +45,9 @@
 <h1>Mid-air collision detected!</h1>
 
 <p>
-  Someone else has made changes to this [% terms.bug %] at the same time you were trying to.
+  Someone else has made changes to
+  [%+ "$terms.bug $bug_id" FILTER bug_link(bug_id) FILTER none %]
+  at the same time you were trying to.
   The changes made were:
 </p>
 
@@ -83,8 +85,8 @@ You have the following choices:
     </form>
   </li>
   <li>
-    <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes,
-      and revisit [% terms.bug %] [%+ bug_id %]</a>
+    Throw away my changes, and
+    [%+ "revisit $terms.bug $bug_id" FILTER bug_link(bug_id) FILTER none %]
   </li>
 </ul>
 
diff --git a/webtools/bugzilla/template/en/default/filterexceptions.pl b/webtools/bugzilla/template/en/default/filterexceptions.pl
index ea5896730db..88ccf874fb4 100644
--- a/webtools/bugzilla/template/en/default/filterexceptions.pl
+++ b/webtools/bugzilla/template/en/default/filterexceptions.pl
@@ -382,15 +382,6 @@
   'product.maxvotes', 
 ],
 
-'bug/process/confirm-duplicate.html.tmpl' => [
-  'original_bug_id', 
-  'duplicate_bug_id', 
-],
-
-'bug/process/midair.html.tmpl' => [
-  'bug_id', 
-],
-
 'bug/process/results.html.tmpl' => [
   'title.$type', 
   '"$terms.Bug $id" FILTER bug_link(id)',