diff --git a/upload/template/default/search/pubsearch.htm b/upload/template/default/search/pubsearch.htm
index 2379f9f3c49d616fc0a77699d63c02956efa5133..b7ec3be2af97bcb3d77740f037b7726c7ff1771e 100644
--- a/upload/template/default/search/pubsearch.htm
+++ b/upload/template/default/search/pubsearch.htm
@@ -34,7 +34,7 @@
 <!--{else}-->
 	<!--{if !empty($srchtype)}--><input type="hidden" name="srchtype" value="$srchtype" /><!--{/if}-->
 	<!--{if $srchtype != 'threadsort'}-->
-		<div class="hm mtw ptw pbw"><h1 class="mtw ptw"><a href="./" title="$_G['setting']['bbname']"><img src="{IMGDIR}/logo_sc.png" alt="$_G['setting']['bbname']" /></a></a></h1></div>
+		<div class="hm mtw ptw pbw"><h1 class="mtw ptw"><a href="./" title="$_G['setting']['bbname']"><img src="{IMGDIR}/logo_sc.png" alt="$_G['setting']['bbname']" /></a></h1></div>
 		<table id="scform" cellspacing="0" cellpadding="0" style="margin: 0 auto;">
 			<tr>
 				<td id="scform_tb" class="xs2">
diff --git a/upload/template/default/tag/tagitem.htm b/upload/template/default/tag/tagitem.htm
index b8409e0faa373a004e118e63755ab3995a6c3a54..7a085acd61ff79bb6e047dc2aeb9c1bc69d01acb 100644
--- a/upload/template/default/tag/tagitem.htm
+++ b/upload/template/default/tag/tagitem.htm
@@ -4,10 +4,8 @@
 	<div class="z">
 		<a href="./" class="nvhm" title="{lang homepage}">$_G[setting][bbname]</a> <em>&rsaquo;</em>
 		<a href="misc.php?mod=tag">{lang tag}</a>
-		<!--{if $tagname}-->
-			<em>&rsaquo;</em>
-			<a href="misc.php?mod=tag&id=$id">$tagname</a>
-		<!--{/if}-->
+		<em>&rsaquo;</em>
+		<a href="misc.php?mod=tag&id=$id">$tagname</a>
 		<!--{if $showtype == 'thread'}-->
 			<em>&rsaquo;</em> {lang related_thread}
 		<!--{/if}-->
@@ -55,6 +53,7 @@
 									<!--{else}-->
 										<img src="{IMGDIR}/folder_$thread[folder].gif" />
 									<!--{/if}-->
+									</a>
 								</td>
 								<th>
 									<a href="forum.php?mod=viewthread&tid=$thread[tid]" target="_blank" $thread[highlight]>$thread['subject']</a>