diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index d97081293..d087d026d 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -524,9 +524,9 @@ class Pref_Feeds extends Handler_Protected {
 
 			$title = htmlspecialchars($row["title"]);
 
-			print_hidden("id", "$feed_id");
-			print_hidden("op", "pref-feeds");
-			print_hidden("method", "editSave");
+			print \Controls\hidden_tag("id", "$feed_id");
+			print \Controls\hidden_tag("op", "pref-feeds");
+			print \Controls\hidden_tag("method", "editSave");
 
 			print "<header>".__("Feed")."</header>";
 			print "<section>";
@@ -821,9 +821,9 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<p>";
 
-		print_hidden("ids", "$feed_ids");
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchEditSave");
+		print \Controls\hidden_tag("ids", "$feed_ids");
+		print \Controls\hidden_tag("op", "pref-feeds");
+		print \Controls\hidden_tag("method", "batchEditSave");
 
 		print "<header>".__("Feed")."</header>";
 		print "<section>";
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 23275a1d6..9b740753a 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -327,16 +327,16 @@ class Pref_Filters extends Handler_Protected {
 
 			print "<form onsubmit='return false'>";
 
-			print_hidden("op", "pref-filters");
+			print \Controls\hidden_tag("op", "pref-filters");
 
 			if ($filter_id) {
-				print_hidden("id", "$filter_id");
-				print_hidden("method", "editSave");
+				print \Controls\hidden_tag("id", "$filter_id");
+				print \Controls\hidden_tag("method", "editSave");
 			} else {
-				print_hidden("method", "add");
+				print \Controls\hidden_tag("method", "add");
 			}
 
-			print_hidden("csrf_token", $_SESSION['csrf_token']);
+			print \Controls\hidden_tag("csrf_token", $_SESSION['csrf_token']);
 
 			print "<header>".__("Caption")."</header>
 				<section>
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index 3f26ca900..b82999281 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -218,9 +218,9 @@ class Af_Proxy_Http extends Plugin {
 			}
 			</script>";
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("method", "save");
-		print_hidden("plugin", "af_proxy_http");
+		print \Controls\hidden_tag("op", "pluginhandler");
+		print \Controls\hidden_tag("method", "save");
+		print \Controls\hidden_tag("plugin", "af_proxy_http");
 
 		$proxy_all = $this->host->get($this, "proxy_all");
 		print_checkbox("proxy_all", $proxy_all);
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 47ff98fc2..715e63927 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -157,9 +157,9 @@ class Af_Psql_Trgm extends Plugin {
 				}
 				</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "af_psql_trgm");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "af_psql_trgm");
 
 			print "<h2>" . __("Global settings") . "</h2>";
 
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 4d21a831c..435864c21 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -87,9 +87,9 @@ class Af_Readability extends Plugin {
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "af_readability");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "af_readability");
 
 			$enable_share_anything = $this->host->get($this, "enable_share_anything");
 
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index b9a2db68d..b9891ea03 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -58,9 +58,9 @@ class Af_RedditImgur extends Plugin {
 			}
 			</script>";
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("method", "save");
-		print_hidden("plugin", "af_redditimgur");
+		print \Controls\hidden_tag("op", "pluginhandler");
+		print \Controls\hidden_tag("method", "save");
+		print \Controls\hidden_tag("plugin", "af_redditimgur");
 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index b1263ece5..ffd0397e0 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -58,9 +58,9 @@ class Mail extends Plugin {
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "mail");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "mail");
 
 			$addresslist = $this->host->get($this, "addresslist");
 
@@ -86,9 +86,9 @@ class Mail extends Plugin {
 		$ids = explode(",", $_REQUEST['param']);
 		$ids_qmarks = arr_qmarks($ids);
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("plugin", "mail");
-		print_hidden("method", "sendEmail");
+		print \Controls\hidden_tag("op", "pluginhandler");
+		print \Controls\hidden_tag("plugin", "mail");
+		print \Controls\hidden_tag("method", "sendEmail");
 
 		$sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
 			id = ?");
@@ -105,8 +105,8 @@ class Mail extends Plugin {
 		if (!$user_name)
 			$user_name = $_SESSION['name'];
 
-		print_hidden("from_email", "$user_email");
-		print_hidden("from_name", "$user_name");
+		print \Controls\hidden_tag("from_email", "$user_email");
+		print \Controls\hidden_tag("from_name", "$user_name");
 
 		$tpl = new Templator();
 
diff --git a/plugins/note/init.php b/plugins/note/init.php
index d5b231190..0634d4c57 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -37,10 +37,10 @@ class Note extends Plugin {
 
 			$note = $row['note'];
 
-			print_hidden("id", "$param");
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "setNote");
-			print_hidden("plugin", "note");
+			print \Controls\hidden_tag("id", "$param");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "setNote");
+			print \Controls\hidden_tag("plugin", "note");
 
 			print "<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 02344eb14..1b27cc017 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -71,9 +71,9 @@ class NSFW extends Plugin {
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "nsfw");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "nsfw");
 
 			print "<table width=\"100%\" class=\"prefPrefsList\">";