diff --git a/data/System/TagsPluginTagDetailsDialogExtended.txt b/data/System/TagsPluginTagDetailsDialogExtended.txt
index a5ae3e4..8337ec0 100644
--- a/data/System/TagsPluginTagDetailsDialogExtended.txt
+++ b/data/System/TagsPluginTagDetailsDialogExtended.txt
@@ -40,13 +40,14 @@
   </form>
 </div>
 
-%TAGCLOUD{
-  terms="$percntTAGSEARCH{ query=\"topic\" tag=\"$percntTAGNAME$percnt\" format=\"$item:1:$web:$topic:$user\" visibility=\"user\" }$percnt"
-  split="[,]+"
-  header="%MAKETEXT{"Where else can I find this tag:"}%%BR% <div style=\"text-align:center; padding:15px;line-height:180%\">"
-  format="<span style='font-size:$weightpx;line-height:90%'><a href='$percntSCRIPTURL{view}$percnt/$3/$4' style='color:$fadeRGB(104,144,184,0,102,255);text-decoration:none' title='$count'>$4</a></span>"
-  footer="</div>"
-  warn="off"
+%TAGSEARCH{ 
+  query="topic" 
+  tag="%TAGNAME%" 
+  header="%MAKETEXT{"Where else can I find this tag:"}%%BR%%BR%$n"
+  format="   * <span class='foswikiGrayText'>$web</span> [[$item][$topic]]" 
+  sep="$n" 
+  visibility="user" 
+  order="topic"
 }%
 
 <span id='tagsplugin_groups' class='tagsplugin_hide'>%TAGGROUPS{format="$group" sep=","}%</span>
diff --git a/data/System/TagsPluginTagDetailsDialogSimple.txt b/data/System/TagsPluginTagDetailsDialogSimple.txt
index 88586c8..2a13c35 100644
--- a/data/System/TagsPluginTagDetailsDialogSimple.txt
+++ b/data/System/TagsPluginTagDetailsDialogSimple.txt
@@ -4,13 +4,14 @@
 
 <img src="%PUBURL%/%SYSTEMWEB%/DocumentGraphics/processing.gif" id="tagsplugin_tagdetails_processing" style="display:none;" />
 
-%TAGCLOUD{
-  terms="$percntTAGSEARCH{ query=\"topic\" tag=\"$percntTAGNAME$percnt\" format=\"$item:1:$web:$topic:$user\" visibility=\"user\" }$percnt"
-  split="[,]+"
-  header="%MAKETEXT{"Where else can I find this tag:"}%%BR% <div style=\"text-align:center; padding:15px;line-height:180%\">"
-  format="<span style='font-size:$weightpx;line-height:90%'><a href='$percntSCRIPTURL{view}$percnt/$3/$4' style='color:$fadeRGB(104,144,184,0,102,255);text-decoration:none' title='$count'>$4</a></span>"
-  footer="</div>"
-  warn="off"
+%TAGSEARCH{ 
+  query="topic" 
+  tag="%TAGNAME%" 
+  header="%MAKETEXT{"Where else can I find this tag:"}%%BR%%BR%$n"
+  format="   * <span class='foswikiGrayText'>$web</span> [[$item][$topic]]" 
+  sep="$n" 
+  visibility="user" 
+  order="topic"
 }%
 
 </noautolink>
diff --git a/lib/Foswiki/Plugins/TagsPlugin/Public.pm b/lib/Foswiki/Plugins/TagsPlugin/Public.pm
index 05683c0..9d79030 100644
--- a/lib/Foswiki/Plugins/TagsPlugin/Public.pm
+++ b/lib/Foswiki/Plugins/TagsPlugin/Public.pm
@@ -217,7 +217,7 @@ sub do {
     my $statement     = sprintf(
 'UPDATE %s SET public = ? WHERE %s = ? AND %s = ? AND %s = ? AND public = ?',
         qw( UserItemTag item_id tag_id user_id ) );
-    my $affected_rows =
+    $affected_rows =
       $db->dbInsert( $statement, $public, $item_id, $tag_id, $user_id,
         $public == "0" ? 1 : 0 );
     Foswiki::Func::writeDebug(