diff --git a/backend.php b/backend.php
index e541c85c..30c45e11 100644
--- a/backend.php
+++ b/backend.php
@@ -640,13 +640,25 @@
 				ORDER BY tag_name");
 	
 			$tags_str = "";
+			$f_tags_str = "";
+
+			$num_tags = 0;
 
 			while ($tmp_line = db_fetch_assoc($tmp_result)) {
-				$tag = $tmp_line["tag_name"];
-				$tags_str .= "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a>, "; 
-			}		
+				$num_tags++;
+				$tag = $tmp_line["tag_name"];				
+				$tag_str = "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a>, "; 
+				
+				if ($num_tags == 5) {
+					$tags_str .= "<a href=\"javascript:showBlockElement('allEntryTags')\">...</a>";
+				} else if ($num_tags < 5) {
+					$tags_str .= $tag_str;
+				}
+				$f_tags_str .= $tag_str;
+			}
 
-			$tags_str = preg_replace("/, $/", "", $tags_str);			
+			$tags_str = preg_replace("/, $/", "", $tags_str);
+			$f_tags_str = preg_replace("/, $/", "", $f_tags_str);
 
 			print "<tr><td width='50%'>
 				<a href=\"" . $line["link"] . "\">".$line["link"]."</a>
@@ -661,7 +673,13 @@
 			print "</table></div>";
 
 			print "<div class=\"postIcon\">" . $feed_icon . "</div>";
-			print "<div class=\"postContent\">" . $line["content"] . "</div>";
+			print "<div class=\"postContent\">";
+			
+			if (db_num_rows($tmp_result) > 5) {
+				print "<div id=\"allEntryTags\">Tags: $f_tags_str</div>";
+			}
+
+			print $line["content"] . "</div>";
 			
 			print "</div>";
 
@@ -1099,7 +1117,7 @@
 					if ($line["feed_title"]) {			
 						print "<td class='hlContent'>$content_link</td>";
 						print "<td class='hlFeed'>
-							<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>";
+							<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>&nbsp;</td>";
 					} else {			
 						print "<td class='hlContent'>";
 		
diff --git a/functions.php b/functions.php
index 8095b314..742ace4a 100644
--- a/functions.php
+++ b/functions.php
@@ -431,7 +431,7 @@
 
 				$entry_tags = null;
 
-				preg_match_all("/<a.*?rel=.tag.*?>([^>]+)<\/a>/i", 
+				preg_match_all("/<a.*?href=.http:\/\/technorati.com\/tag\/([^\"\'>]+)/i", 
 					$entry_content_unescaped, $entry_tags);
 
 //				print "<br>$entry_title : $entry_content_unescaped<br>";
diff --git a/tt-rss.css b/tt-rss.css
index c801e671..15f87ff2 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -770,3 +770,11 @@ div.postHeader td.postDate {
 	display : none;
 }
 
+#allEntryTags {
+	font-size : x-small;
+	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	border-color : #c0c0c0;
+	padding-bottom : 5px;
+	display : none;
+}