diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc
index c377012..5f037e2 100644
--- a/lib/util/ktutil.inc
+++ b/lib/util/ktutil.inc
@@ -1272,8 +1272,9 @@ class KTUtil {
     {
         if (file_exists($path)) {
             // IE7 adds underscores to filenames: fix
+            // IE6 displays characters incorrectly
             $browser = $_SERVER['HTTP_USER_AGENT'];
-            if ( strpos( strtoupper( $browser), 'MSIE 7') !== false) {
+            if ( strpos( strtoupper( $browser), 'MSIE') !== false) {
                 $fileName = rawurlencode($fileName);
             }
 
diff --git a/plugins/tagcloud/TagCloudRedirectPage.php b/plugins/tagcloud/TagCloudRedirectPage.php
index ea38de5..415c004 100644
--- a/plugins/tagcloud/TagCloudRedirectPage.php
+++ b/plugins/tagcloud/TagCloudRedirectPage.php
@@ -63,7 +63,7 @@ class TagCloudRedirectPage extends KTStandardDispatcher {
 	 */
     function do_main() {
         // Clear the session for a new search
-        $url = isset($_REQUEST['tag']) ? 'tag='.$_REQUEST['tag'] : '';
+        $url = isset($_REQUEST['tag']) ? 'tag='.urlencode($_REQUEST['tag']).'&decode=true' : '';
         $_SESSION['tagList'] = array();
         $this->redirectTo('search', $url);
     }
@@ -81,12 +81,17 @@ class TagCloudRedirectPage extends KTStandardDispatcher {
 
         $_SESSION['tagList'] = $tagList;
 
-        $this->redirectTo('search', 'tag='.$tag);
+        $url = 'tag='.urlencode($tag).'&decode=true';
+        $this->redirectTo('search', $url);
     }
 
     function do_search() {
         // Get the tag to search for and create search query
         $tag = isset($_REQUEST['tag']) ? $_REQUEST['tag'] : '';
+        $decode = isset($_REQUEST['decode']) ? $_REQUEST['decode'] : '';
+        if($decode == 'true'){
+            $tag = urldecode($tag);
+        }
 
         $iUserId = $_SESSION['userID'];
         $oUser = User::get($iUserId);
@@ -102,7 +107,10 @@ class TagCloudRedirectPage extends KTStandardDispatcher {
 
             $base = KTUtil::addQueryString('TagCloudRedirection&action=recall', null);
             foreach($aTagTree as $key => $item){
-                $url = $base.'&tag='.$item.'&pos='.$key;
+                if($tag == $item){
+                    continue;
+                }
+                $url = $base.'&tag='.urlencode($item).'&pos='.$key;
                 $this->aBreadcrumbs[] = array('url' => $url, 'name' => $item);
             }
         }
@@ -134,7 +142,7 @@ class TagCloudRedirectPage extends KTStandardDispatcher {
 
         $aOptions = $collection->getEnvironOptions(); // extract data from the environment
 
-        $aOptions['return_url'] = KTUtil::addQueryString('TagCloudRedirection&action=search&tag='. $tag, false );
+        $aOptions['return_url'] = KTUtil::addQueryString('TagCloudRedirection&action=search&tag='. urlencode($tag), false );
         $aOptions['empty_message'] = _kt('No documents or folders match this query.');
         $aOptions['is_browse'] = true;
 
diff --git a/plugins/tagcloud/templates/TagCloud/portlet.smarty b/plugins/tagcloud/templates/TagCloud/portlet.smarty
index 13ec9c0..7db47be 100644
--- a/plugins/tagcloud/templates/TagCloud/portlet.smarty
+++ b/plugins/tagcloud/templates/TagCloud/portlet.smarty
@@ -10,20 +10,19 @@ text-decoration: none;
 </style>
 {/literal}
 
-{if empty($tags)}
-<p>
-    {i18n}There are no tags defined or accessible.{/i18n}
-</p>
-
-{else}
-<div id=tagcloud>
-{foreach from=$tags key=tag item=size}
-
-	<a  href="{$url}&tag={$tag|urlencode}" style="color: #333; font-size: {$size}px">{$tag|sanitize}</a>&nbsp;
-
-{/foreach}
+<div style="padding: 5px;">
+    {if empty($tags)}
+        <p>
+            {i18n}There are no tags defined or accessible.{/i18n}
+        </p>
+    {else}
+        <div id=tagcloud>
+            {foreach from=$tags key=tag item=size}
+            	<a  href="{$url}&tag={$tag|urlencode}" style="color: #333; font-size: {$size}px">{$tag|sanitize_input}</a>&nbsp;
+            {/foreach}
+        </div>
+    {/if}
 </div>
-{/if}
 
 <br>
 <br>
\ No newline at end of file