diff --git a/classes/dlg.php b/classes/dlg.php
index 7b1abca3..60c5265b 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -144,7 +144,7 @@ class Dlg extends Handler_Protected {
 
 			$key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " .
+			echo "<a href=\"javascript:viewfeed({feed:'$key_escaped'}) \" style=\"font-size: " .
 				$size . "px\" title=\"$value articles tagged with " .
 				$key . '">' . $key . '</a> ';
 		}
diff --git a/classes/feeds.php b/classes/feeds.php
index 9e07057b..c3cb72da 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -455,7 +455,7 @@ class Feeds extends Handler_Protected {
 
 							$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
 								"<div style='float : right'>$feed_icon_img</div>".
-								"<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".
+								"<a class='title' href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
 								$line["feed_title"]."</a>
 								$vf_catchup_link</div>";
 
@@ -500,7 +500,7 @@ class Feeds extends Handler_Protected {
 						if (@$line["feed_title"]) {
 							$rgba = @$rgba_cache[$feed_id];
 
-							$reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">".
+							$reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
 								truncate_string($line["feed_title"],30)."</a></span>";
 						}
 					}
@@ -517,7 +517,7 @@ class Feeds extends Handler_Protected {
 
 					if ($line["feed_title"] && !$vfeed_group_enabled) {
 
-						$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
+						$reply['content'] .= "<span onclick=\"viewfeed({feed:$feed_id})\"
 							style=\"cursor : pointer\"
 							title=\"".htmlspecialchars($line['feed_title'])."\">
 							$feed_icon_img</span>";
@@ -560,7 +560,7 @@ class Feeds extends Handler_Protected {
 
 							$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
-								"<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">".
+								"<a href=\"#\" class='title' onclick=\"viewfeed({feed:$feed_id})\">".
 								$line["feed_title"]."</a> $vf_catchup_link</div>";
 
 						}
@@ -624,7 +624,7 @@ class Feeds extends Handler_Protected {
 
 							$reply['content'] .= "<div class=\"hlFeed\">
 								<a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
-								onclick=\"viewfeed($feed_id)\">".
+								onclick=\"viewfeed({feed:$feed_id})\">".
 								truncate_string($line["feed_title"],30)."</a>
 							</div>";
 						}
@@ -639,7 +639,7 @@ class Feeds extends Handler_Protected {
 					if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
 						$reply['content'] .= "<span style=\"cursor : pointer\"
 							title=\"".htmlspecialchars($line["feed_title"])."\"
-							onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+							onclick=\"viewfeed({feed:$feed_id})\">$feed_icon_img</span>";
 					}
 					$reply['content'] .= "</div>";
 
diff --git a/include/functions2.php b/include/functions2.php
index 19012c8e..9bbfc7b2 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -1618,7 +1618,7 @@
 			$tags_str = "";
 
 			for ($i = 0; $i < $maxtags; $i++) {
-				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, ";
+				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
 			}
 
 			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
diff --git a/js/functions.js b/js/functions.js
index 843edaec..8e569496 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1240,7 +1240,7 @@ function unsubscribeFeed(feed_id, title) {
 						updateFeedList();
 					} else {
 						if (feed_id == getActiveFeedId())
-							setTimeout("viewfeed(-5)", 100);
+							setTimeout("viewfeed({feed:-5})", 100);
 
 						if (feed_id < 0) updateFeedList();
 					}
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index d83dff80..d89c122f 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -88,7 +88,7 @@ class Af_Psql_Trgm extends Plugin {
 			print " <a target=\"_blank\" href=\"$article_link\">".
 				$line["title"]."</a>";
 
-			print " (<a href=\"#\" onclick=\"viewfeed(".$line["feed_id"].")\">".
+			print " (<a href=\"#\" onclick=\"viewfeed({feed:".$line["feed_id"]."})\">".
 				htmlspecialchars($line["feed_title"])."</a>)";
 
 			print " <span class='insensitive'>($sm)</span>";