Index: /branches/release-29/default_templates/tags.mtml
===================================================================
--- /branches/release-29/default_templates/tags.mtml (revision 1102)
+++ /branches/release-29/default_templates/tags.mtml (revision 1287)
@@ -3,5 +3,6 @@
     <h4 class="entry-tags-header"><__trans phrase="Tags"><span class="delimiter">:</span></h4>
     <ul class="entry-tags-list">
-        <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>&amp;IncludeBlogs=<$MTBlogID$>" rel="tag"><$MTTagName$></a></MTEntryTags></li>
+        <mt:setvarblock name="blog_id"><$MTBlogID$></mt:setvarblock>
+        <li class="entry-tag"><MTEntryTags glue='<span class="delimiter">,</span></li> <li class="entry-tag">'><a href="<$MTTagSearchLink$>" rel="tag"><$MTTagName$></a></MTEntryTags></li>
     </ul>
 </div>
Index: /branches/release-29/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-29/lib/MT/Template/ContextHandlers.pm (revision 1236)
+++ /branches/release-29/lib/MT/Template/ContextHandlers.pm (revision 1287)
@@ -1934,9 +1934,8 @@
         or return $ctx->error($ctx->errstr);
 
-    my $param = 'tag=' . encode_url($tag->name);
+    my $param = '';
     my $blogs = $blog_terms{blog_id};
 
     if ($blogs) {
-        $param .= '&amp;';
         if (ref $blogs eq 'ARRAY') {
             if ($blog_args{not}{blog_id}) {
@@ -1948,5 +1947,7 @@
             $param .= 'blog_id=' . $blogs;
         }
-    }
+        $param .= '&amp;';
+    }
+    $param .= 'tag=' . encode_url($tag->name);
     my $path = _hdlr_cgi_path($ctx);
     $path . $ctx->{config}->SearchScript . '?' . $param;