diff --git a/classes/pagination.class.php b/classes/pagination.class.php
index d5b481a..2b7ba5c 100644
--- a/classes/pagination.class.php
+++ b/classes/pagination.class.php
@@ -75,13 +75,15 @@ Author URI: http://www.mis-algoritmos.com
 						echo "<div class=\"$this->className\">$this->pagination</div>";
 			}
 		function get_pagenum_link($id){
-				if(strpos($this->target,'?')===false)
+				//if(strpos($this->target,'?')===false)
 						if($this->urlF)
 								return str_replace($this->urlF,$id,$this->target);
+								
 							else
 								return "$this->target?$this->parameterName=$id";
-					else
-						return "$this->target&$this->parameterName=$id";
+					//else 
+						//return "$this->target&$this->parameterName=$id";
+						
 			}
 		
 		function calculate(){
diff --git a/rss.php b/rss.php
index 952940f..ee37ce6 100644
--- a/rss.php
+++ b/rss.php
@@ -79,15 +79,18 @@
 					$desc = $tumble->getMp3Player($register["url"]);
 					break;
 			}
-			$url = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php/post/").$register["id_post"]."/";
-			$formatedDate = gmdate("D, d M Y H:i:s \G\M\T", strtotime($register["date"]));
+			$tit = htmlspecialchars($tit);
+			$url = htmlspecialchars($url);
+			$strEnd=($conf->urlFriendly) ? "/" : "";
+			$url = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
+			$formatedDate = date("r", strtotime($register["date"])+transform_offset($conf->offsetTime));
 ?>
 
 			<item>
 				<title><?php echo $tit;?></title>
 				<description><![CDATA[<?php echo $desc;?>]]></description>
 				<link><?php echo $url;?></link>
-				<guid isPermaLink="true"><?php echo $conf->urlGelato."/index.php/post/".$register["id_post"]."/";?></guid>				
+				<guid isPermaLink="true"><?php echo $url;?></guid>				
 				<pubDate><?php echo $formatedDate;?></pubDate>				
 			</item>