Index: developer/block.tags.tpl
===================================================================
--- developer/block.tags.tpl	(revision 19)
+++ developer/block.tags.tpl	(revision 206)
@@ -1,7 +1,7 @@
 <div class="block">
 	<ul class="cloud">						
 		{foreach from=$aTags item=oTag}
-			<li><a class="w{$oTag->getSize()}" rel="tag" href="{router page='tag'}{$oTag->getText()|escape:'html'}/">{$oTag->getText()|escape:'html'}</a></li>	
+			<li><a class="w{$oTag->getSize()}" rel="tag" href="{router page='tag'}{$oTag->getText()|escape:'url'}/">{$oTag->getText()|escape:'html'}</a></li>	
 		{/foreach}
 	</ul>
 </div>
\ No newline at end of file
Index: developer/block.tagsCountry.tpl
===================================================================
--- developer/block.tagsCountry.tpl	(revision 19)
+++ developer/block.tagsCountry.tpl	(revision 206)
@@ -3,7 +3,7 @@
 		<h2>{$aLang.block_country_tags}</h2>					
 		<ul class="cloud">
 			{foreach from=$aCountryList item=aCountry}
-				<li><a class="w{$aCountry.size}" rel="tag" href="{router page='people'}country/{$aCountry.name|escape:'html'}/">{$aCountry.name|escape:'html'}</a></li>	
+				<li><a class="w{$aCountry.size}" rel="tag" href="{router page='people'}country/{$aCountry.name|escape:'url'}/">{$aCountry.name|escape:'html'}</a></li>	
 			{/foreach}					
 		</ul>									
 	</div>
Index: developer/topic.tpl
===================================================================
--- developer/topic.tpl	(revision 19)
+++ developer/topic.tpl	(revision 206)
@@ -65,7 +65,7 @@
 
 	<ul class="tags">
 		{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
-			<li><a href="{router page='tag'}{$sTag|escape:'html'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
+			<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
 		{/foreach}								
 	</ul>
 
Index: developer/actions/ActionTag/index.tpl
===================================================================
--- developer/actions/ActionTag/index.tpl	(revision 19)
+++ developer/actions/ActionTag/index.tpl	(revision 206)
@@ -4,7 +4,7 @@
 {literal}
 <script>
 function submitTags(sTag) {		
-	window.location=DIR_WEB_ROOT+'/tag/'+sTag+'/';
+	window.location=DIR_WEB_ROOT+'/tag/'+encodeURIComponent(sTag)+'/';
 	return false;
 }
 </script>
Index: developer/block.tagsCity.tpl
===================================================================
--- developer/block.tagsCity.tpl	(revision 19)
+++ developer/block.tagsCity.tpl	(revision 206)
@@ -3,7 +3,7 @@
 		<h2>{$aLang.block_city_tags}</h2>					
 		<ul class="cloud">
 			{foreach from=$aCityList item=aCity}
-				<li><a class="w{$aCity.size}" rel="tag" href="{router page='people'}city/{$aCity.name|escape:'html'}/" >{$aCity.name|escape:'html'}</a></li>	
+				<li><a class="w{$aCity.size}" rel="tag" href="{router page='people'}city/{$aCity.name|escape:'url'}/" >{$aCity.name|escape:'html'}</a></li>	
 			{/foreach}					
 		</ul>									
 	</div>
Index: new/block.tags.tpl
===================================================================
--- new/block.tags.tpl	(revision 19)
+++ new/block.tags.tpl	(revision 206)
@@ -4,7 +4,7 @@
 					
 					<ul class="cloud">						
 						{foreach from=$aTags item=oTag}
-							<li><a class="w{$oTag->getSize()}" rel="tag" href="{router page='tag'}{$oTag->getText()|escape:'html'}/">{$oTag->getText()|escape:'html'}</a></li>	
+							<li><a class="w{$oTag->getSize()}" rel="tag" href="{router page='tag'}{$oTag->getText()|escape:'url'}/">{$oTag->getText()|escape:'html'}</a></li>	
 						{/foreach}
 					</ul>
 					
Index: new/block.tagsCountry.tpl
===================================================================
--- new/block.tagsCountry.tpl	(revision 19)
+++ new/block.tagsCountry.tpl	(revision 206)
@@ -5,7 +5,7 @@
 					<h1>{$aLang.block_country_tags}</h1>					
 					<ul class="cloud">
 						{foreach from=$aCountryList item=aCountry}
-							<li><a class="w{$aCountry.size}" rel="tag" href="{router page='people'}country/{$aCountry.name|escape:'html'}/">{$aCountry.name|escape:'html'}</a></li>	
+							<li><a class="w{$aCountry.size}" rel="tag" href="{router page='people'}country/{$aCountry.name|escape:'url'}/">{$aCountry.name|escape:'html'}</a></li>	
 						{/foreach}					
 					</ul>									
 				</div></div>
Index: new/topic.tpl
===================================================================
--- new/topic.tpl	(revision 19)
+++ new/topic.tpl	(revision 206)
@@ -53,7 +53,7 @@
 				</div>				
 				<ul class="tags">
 					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
-						<li><a href="{router page='tag'}{$sTag|escape:'html'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
+						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
 					{/foreach}									
 				</ul>				
 				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId())|| strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
Index: new/actions/ActionTag/index.tpl
===================================================================
--- new/actions/ActionTag/index.tpl	(revision 19)
+++ new/actions/ActionTag/index.tpl	(revision 206)
@@ -3,7 +3,7 @@
 {literal}
 <script>
 function submitTags(sTag) {		
-	window.location=DIR_WEB_ROOT+'/tag/'+sTag+'/';
+	window.location=DIR_WEB_ROOT+'/tag/'+encodeURIComponent(sTag)+'/';
 	return false;
 }
 </script>
Index: new/topic_list.tpl
===================================================================
--- new/topic_list.tpl	(revision 19)
+++ new/topic_list.tpl	(revision 206)
@@ -64,7 +64,7 @@
 				</div>				
 				<ul class="tags">
 					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
-						<li><a href="{router page='tag'}{$sTag|escape:'html'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
+						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
 					{/foreach}								
 				</ul>				
 				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
Index: new/block.tagsCity.tpl
===================================================================
--- new/block.tagsCity.tpl	(revision 19)
+++ new/block.tagsCity.tpl	(revision 206)
@@ -5,7 +5,7 @@
 					<h1>{$aLang.block_city_tags}</h1>					
 					<ul class="cloud">
 						{foreach from=$aCityList item=aCity}
-							<li><a class="w{$aCity.size}" rel="tag" href="{router page='people'}city/{$aCity.name|escape:'html'}/" >{$aCity.name|escape:'html'}</a></li>	
+							<li><a class="w{$aCity.size}" rel="tag" href="{router page='people'}city/{$aCity.name|escape:'url'}/" >{$aCity.name|escape:'html'}</a></li>	
 						{/foreach}					
 					</ul>									
 				</div></div>