diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25b963075..df9b6a5af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@
 - Demo mode: Allow registering torrents by default [\#1440](https://github.com/torrentpier/torrentpier/pull/1440) ([belomaxorka](https://github.com/belomaxorka))
 - Temp: Removed showing forum description in `viewforum.php` [\#1465](https://github.com/torrentpier/torrentpier/pull/1465) ([belomaxorka](https://github.com/belomaxorka))
 - Code refactoring [\#1441](https://github.com/torrentpier/torrentpier/pull/1441) ([belomaxorka](https://github.com/belomaxorka))
-- Minor improvements [\#1435](https://github.com/torrentpier/torrentpier/pull/1435), [\#1443](https://github.com/torrentpier/torrentpier/pull/1443), [\#1446](https://github.com/torrentpier/torrentpier/pull/1446), [\#1450](https://github.com/torrentpier/torrentpier/pull/1450), [\#1452](https://github.com/torrentpier/torrentpier/pull/1452), [\#1458](https://github.com/torrentpier/torrentpier/pull/1458), [\#1461](https://github.com/torrentpier/torrentpier/pull/1461), [\#1462](https://github.com/torrentpier/torrentpier/pull/1462), [\#1467](https://github.com/torrentpier/torrentpier/pull/1467) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#1435](https://github.com/torrentpier/torrentpier/pull/1435), [\#1443](https://github.com/torrentpier/torrentpier/pull/1443), [\#1446](https://github.com/torrentpier/torrentpier/pull/1446), [\#1450](https://github.com/torrentpier/torrentpier/pull/1450), [\#1452](https://github.com/torrentpier/torrentpier/pull/1452), [\#1458](https://github.com/torrentpier/torrentpier/pull/1458), [\#1461](https://github.com/torrentpier/torrentpier/pull/1461), [\#1462](https://github.com/torrentpier/torrentpier/pull/1462), [\#1467](https://github.com/torrentpier/torrentpier/pull/1467), [\#1469](https://github.com/torrentpier/torrentpier/pull/1469) ([belomaxorka](https://github.com/belomaxorka))
 - Updated deps [\#1454](https://github.com/torrentpier/torrentpier/pull/1454), [\#1455](https://github.com/torrentpier/torrentpier/pull/1455), [\#1459](https://github.com/torrentpier/torrentpier/pull/1459), [\#1460](https://github.com/torrentpier/torrentpier/pull/1460) ([belomaxorka](https://github.com/belomaxorka))
 - New Crowdin updates [\#1444](https://github.com/torrentpier/torrentpier/pull/1444), [\#1447](https://github.com/torrentpier/torrentpier/pull/1447), [\#1453](https://github.com/torrentpier/torrentpier/pull/1453) ([Exileum](https://github.com/Exileum))
 
diff --git a/styles/templates/admin/admin_log.tpl b/styles/templates/admin/admin_log.tpl
index c22dd4bdd..115b09de3 100644
--- a/styles/templates/admin/admin_log.tpl
+++ b/styles/templates/admin/admin_log.tpl
@@ -19,7 +19,7 @@
 <h1>{L_ACTIONS_LOG}</h1>
 
 <form action="{S_LOG_ACTION}" method="post">
-    <!-- IF TOPIC_CSV --><input type="hidden" name="{POST_TOPIC_URL}" value="{TOPIC_CSV}"/><!-- ENDIF -->
+    <!-- IF TOPIC_CSV --><input type="hidden" name="{#POST_TOPIC_URL#}" value="{TOPIC_CSV}"/><!-- ENDIF -->
 
     <table class="bordered w100" cellspacing="0">
         <tr>
diff --git a/styles/templates/admin/admin_ug_auth.tpl b/styles/templates/admin/admin_ug_auth.tpl
index 2ff996588..410db31db 100644
--- a/styles/templates/admin/admin_ug_auth.tpl
+++ b/styles/templates/admin/admin_ug_auth.tpl
@@ -170,7 +170,7 @@ thead tr {
 <!-- END f -->
 <!-- END c -->
 
-<input type="hidden" name="{POST_CAT_URL}" value="{SELECTED_CAT}" />
+<input type="hidden" name="{#POST_CAT_URL#}" value="{SELECTED_CAT}" />
 </form>
 
 <form method="post" action="{S_AUTH_ACTION}">
diff --git a/styles/templates/default/index.tpl b/styles/templates/default/index.tpl
index 64b0bec17..05eaca9ab 100644
--- a/styles/templates/default/index.tpl
+++ b/styles/templates/default/index.tpl
@@ -85,7 +85,7 @@
 		<!-- BEGIN f -->
 		<tr>
 			<td class="row1 f_icon">
-			<a href="{U_SEARCH}?{POST_FORUM_URL}={c.f.FORUM_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1"><img class="forum_icon" src="{c.f.FORUM_FOLDER_IMG}" alt="{c.f.FORUM_FOLDER_ALT}" /></a>
+			<a href="{U_SEARCH}?{#POST_FORUM_URL#}={c.f.FORUM_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1"><img class="forum_icon" src="{c.f.FORUM_FOLDER_IMG}" alt="{c.f.FORUM_FOLDER_ALT}" /></a>
 			</td>
 			<td class="row1 f_titles">
 
@@ -99,7 +99,7 @@
 				<p class="subforums">
 					<em>{L_SUBFORUMS}:</em>
 					<!-- BEGIN sf -->
-					<span class="sf_title{c.f.sf.SF_NEW}"><a href="{U_SEARCH}?{POST_FORUM_URL}={c.f.sf.SF_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1" class="dot-sf">&#9658;</a><a href="{FORUM_URL}{c.f.sf.SF_ID}" class="dot-sf">{c.f.sf.SF_NAME}</a></span><span class="sf_separator"></span>
+					<span class="sf_title{c.f.sf.SF_NEW}"><a href="{U_SEARCH}?{#POST_FORUM_URL#}={c.f.sf.SF_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1" class="dot-sf">&#9658;</a><a href="{FORUM_URL}{c.f.sf.SF_ID}" class="dot-sf">{c.f.sf.SF_NAME}</a></span><span class="sf_separator"></span>
 					<!-- END sf -->
 				</p>
 				<!-- ENDIF -->
diff --git a/styles/templates/default/index_map.tpl b/styles/templates/default/index_map.tpl
index 742ac4637..6e6b07531 100644
--- a/styles/templates/default/index_map.tpl
+++ b/styles/templates/default/index_map.tpl
@@ -42,7 +42,7 @@ $(function(){
 	$.each($('#f-map a'), function(i,a) {
 		var f_id = $(a).attr('href');
 		$(a)
-			.attr('href', '{U_FORUM}?{POST_FORUM_URL}='+ f_id)
+			.attr('href', '{U_FORUM}?{#POST_FORUM_URL#}='+ f_id)
 			.before('<img class="feed-small" src="{IMG}feed.png" alt="feed" onclick="open_feed('+ f_id +')">')
 		;
 	});
@@ -55,7 +55,7 @@ $(function(){
 
 <form id="feed-form" method="post" action="feed.php" target="_blank" style="display: none;">
 	<input type="hidden" name="mode" value="get_feed_url">
-	<input type="hidden" name="type" value="{POST_FORUM_URL}">
+	<input type="hidden" name="type" value="{#POST_FORUM_URL#}">
 	<input id="feed-id" type="hidden" name="id" value="">
 </form>
 
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index ca5568e90..a37111a42 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -53,7 +53,7 @@
 				<!-- IF t.p.QUOTE --><a class="txtb" href="{QUOTE_URL}{t.p.POST_ID}">{QUOTE_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF t.p.EDIT --><a class="txtb" href="{EDIT_POST_URL}{t.p.POST_ID}">{EDIT_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF t.p.DELETE --><a class="txtb" href="{DELETE_POST_URL}{t.p.POST_ID}">{DELETE_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
-				<!-- IF t.p.IP --><a class="txtb" href="{IP_POST_URL}{t.p.POST_ID}&amp;{POST_TOPIC_URL}={t.TOPIC_ID}">{IP_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
+				<!-- IF t.p.IP --><a class="txtb" href="{IP_POST_URL}{t.p.POST_ID}&amp;{#POST_TOPIC_URL#}={t.TOPIC_ID}">{IP_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 			</p>
 			<div class="clear"></div>
 		</div>
diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl
index e582a2636..353bc53b3 100644
--- a/styles/templates/default/usercp_register.tpl
+++ b/styles/templates/default/usercp_register.tpl
@@ -49,13 +49,13 @@
 
 <p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
 
-<form id="prof-form" method="post" action="profile.php<!-- IF IS_ADMIN && PR_USER_ID -->?{POST_USERS_URL}={PR_USER_ID}<!-- ENDIF -->"
+<form id="prof-form" method="post" action="profile.php<!-- IF IS_ADMIN && PR_USER_ID -->?{#POST_USERS_URL#}={PR_USER_ID}<!-- ENDIF -->"
       class="tokenized" enctype="multipart/form-data">
     <input type="hidden" name="mode" value="{MODE}"/>
     <input type="hidden" name="reg_agreed" value="1"/>
     <!-- IF NEW_USER --><input type="hidden" name="admin" value="1"/><!-- ENDIF -->
     <!-- IF ADM_EDIT -->
-    <input type="hidden" name="{POST_USERS_URL}" value="{PR_USER_ID}"/>
+    <input type="hidden" name="{#POST_USERS_URL#}" value="{PR_USER_ID}"/>
     <!-- ENDIF -->
 
     <table class="forumline prof-tbl">
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
index dfd73d50e..ddd9c1520 100644
--- a/styles/templates/default/usercp_viewprofile.tpl
+++ b/styles/templates/default/usercp_viewprofile.tpl
@@ -377,7 +377,7 @@ ajax.callback.index_data = function(data) {
 						[ <a href="{U_SEARCH_USER}" class="med">{L_SEARCH_USER_POSTS}</a> ]
 						[ <a href="{U_SEARCH_TOPICS}" class="med">{L_SEARCH_USER_TOPICS}</a> ]
 						[ <a href="{U_SEARCH_RELEASES}" class="med">{L_SEARCH_RELEASES}</a> ]
-						<!-- IF PROFILE_USER || IS_ADMIN -->[ <a href="{U_WATCHED_TOPICS}&{POST_USERS_URL}={PROFILE_USER_ID}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
+						<!-- IF PROFILE_USER || IS_ADMIN -->[ <a href="{U_WATCHED_TOPICS}&{#POST_USERS_URL#}={PROFILE_USER_ID}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
 						[ <a title="{L_ATOM_SUBSCRIBE}" href="#" onclick="return post2url('feed.php', {mode: 'get_feed_url', type: 'u', id: {PROFILE_USER_ID}})">{FEED_IMG}</a> ]
 					</p>
 				</td>
diff --git a/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl
index a7d1b9c94..9557d4d90 100644
--- a/styles/templates/default/viewforum.tpl
+++ b/styles/templates/default/viewforum.tpl
@@ -153,7 +153,7 @@ ajax.callback.mod_action = function (data) {
 
 <div id="mod-action-content" style="display: none;">
 <form id="mod-action" method="post" action="modcp.php" class="tokenized">
-	<input type="hidden" name="{POST_FORUM_URL}" value="{FORUM_ID}" />
+	<input type="hidden" name="{#POST_FORUM_URL#}" value="{FORUM_ID}" />
 	<div class="floatL">
 	<input type="checkbox" onclick="$('.topic-chbox').attr({ checked: this.checked }); if(this.checked){$('.tt-text').addClass('hl-tt');}else{$('.tt-text').removeClass('hl-tt');}" />
 	<!-- IF TORRENTS -->
@@ -630,11 +630,11 @@ td.topic_id { cursor: pointer; }
 
 <!-- IF IS_ADMIN -->
 <div class="med tCenter">{L_ADMIN}:
-  <a href="{POSTING_URL}?mode=new_rel&amp;{POST_FORUM_URL}={FORUM_ID}&amp;edit_tpl=1" class="bold" target="_blank">{L_DESIGNER}</a>&nbsp;&middot;
-  <a href="admin/admin_log.php?{POST_FORUM_URL}={FORUM_ID}&amp;db={$bb_cfg['log_days_keep']}" target="_blank">{L_FORUM_LOGS}</a>&nbsp;&middot;
-  <a href="admin/admin_forums.php?mode=editforum&amp;{POST_FORUM_URL}={FORUM_ID}" target="_blank">{L_EDIT}</a>&nbsp;&middot;
-  <a href="admin/admin_forumauth.php?{POST_FORUM_URL}={FORUM_ID}" target="_blank">{L_PERMISSIONS}</a>&nbsp;&middot;
-  <a href="admin/admin_forums.php?mode=deleteforum&amp;{POST_FORUM_URL}={FORUM_ID}" target="_blank">{L_DELETE}</a>
+  <a href="{POSTING_URL}?mode=new_rel&amp;{#POST_FORUM_URL#}={FORUM_ID}&amp;edit_tpl=1" class="bold" target="_blank">{L_DESIGNER}</a>&nbsp;&middot;
+  <a href="admin/admin_log.php?{#POST_FORUM_URL#}={FORUM_ID}&amp;db={$bb_cfg['log_days_keep']}" target="_blank">{L_FORUM_LOGS}</a>&nbsp;&middot;
+  <a href="admin/admin_forums.php?mode=editforum&amp;{#POST_FORUM_URL#}={FORUM_ID}" target="_blank">{L_EDIT}</a>&nbsp;&middot;
+  <a href="admin/admin_forumauth.php?{#POST_FORUM_URL#}={FORUM_ID}" target="_blank">{L_PERMISSIONS}</a>&nbsp;&middot;
+  <a href="admin/admin_forums.php?mode=deleteforum&amp;{#POST_FORUM_URL#}={FORUM_ID}" target="_blank">{L_DELETE}</a>
 </div>
 <!-- ENDIF / IS_ADMIN -->
 
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 175e73322..59c0cea08 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -287,7 +287,7 @@ function build_poll_add_form (src_el)
 		</td>
 
 		<td class="nowrap" style="padding: 0 4px 2px 4px;">
-			<form action="{U_SEARCH}?{POST_TOPIC_URL}={TOPIC_ID}&amp;dm=1&amp;s=1" method="post">
+			<form action="{U_SEARCH}?{#POST_TOPIC_URL#}={TOPIC_ID}&amp;dm=1&amp;s=1" method="post">
 				<input id="search-text" type="text" name="nm" class="hint" style="width: 150px;" placeholder="{L_SEARCH_IN_TOPIC}" required />
 				<input type="submit" class="bold" value="&raquo;" style="width: 30px;" />
 			</form>
@@ -425,7 +425,7 @@ function build_poll_add_form (src_el)
 				<!-- IF postrow.EDIT --><a class="txtb" href="<!-- IF $bb_cfg['use_ajax_posts'] -->" onclick="edit_post({postrow.POST_ID}, 'edit'); return false;<!-- ELSE -->{EDIT_POST_URL}{postrow.POST_ID}<!-- ENDIF -->">{EDIT_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF postrow.DELETE --><a class="txtb" href="<!-- IF $bb_cfg['use_ajax_posts'] -->" onclick="ajax.exec({ action: 'posts', post_id: {postrow.POST_ID}, topic_id : {TOPIC_ID}, type: 'delete'}); return false;<!-- ELSE -->{DELETE_POST_URL}{postrow.POST_ID}<!-- ENDIF -->">{DELETE_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF postrow.IS_FIRST_POST && $bb_cfg['show_post_bbcode_button'] --><a href="#" class="txtb" onclick="ajax.view_post('{postrow.POST_ID}'); return false;">{CODE_IMG}</a><!-- ENDIF -->
-				<!-- IF postrow.IP --><a class="txtb" href="{IP_POST_URL}{postrow.POST_ID}&amp;{POST_TOPIC_URL}={TOPIC_ID}">{IP_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
+				<!-- IF postrow.IP --><a class="txtb" href="{IP_POST_URL}{postrow.POST_ID}&amp;{#POST_TOPIC_URL#}={TOPIC_ID}">{IP_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF AUTH_MOD -->
 					<a class="menu-root menu-alt1 txtb" href="#mc_{postrow.POST_ID}">{MC_IMG}</a>{POST_BTN_SPACER}
 					<!-- IF not IN_MODERATION --><a class="txtb" href="{PAGE_URL}&amp;mod=1&amp;start={PAGE_START}#{postrow.POST_ID}">{MOD_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
@@ -501,7 +501,7 @@ function build_poll_add_form (src_el)
 	<!-- ELSE -->
 		<div style="<!-- IF TEXT_BUTTONS --> padding: 2px 6px 4px;<!-- ELSE --> padding: 2px 3px;<!-- ENDIF -->" class="post_btn_2">
 			<a class="txtb" href="{PROFILE_URL}{postrow.POSTER_ID}">{PROFILE_IMG}</a>{POST_BTN_SPACER}
-			<a class="txtb" href="{PM_URL}?mode=post&amp;{POST_USERS_URL}={postrow.POSTER_ID}">{PM_IMG}</a>{POST_BTN_SPACER}
+			<a class="txtb" href="{PM_URL}?mode=post&amp;{#POST_USERS_URL#}={postrow.POSTER_ID}">{PM_IMG}</a>{POST_BTN_SPACER}
 		</div>
 	<!-- ENDIF -->
 
@@ -515,9 +515,9 @@ function build_poll_add_form (src_el)
 <tr id="del_split_row" class="row5" style="display: none;">
 	<td colspan="2" class="med pad_4 td2">
 	<form method="post" action="{S_SPLIT_ACTION}">
-	<input type="hidden" name="redirect" value="modcp.php?{POST_TOPIC_URL}={TOPIC_ID}&amp;mode=split" />
-	<input type="hidden" name="{POST_FORUM_URL}" value="{FORUM_ID}" />
-	<input type="hidden" name="{POST_TOPIC_URL}" value="{TOPIC_ID}" />
+	<input type="hidden" name="redirect" value="modcp.php?{#POST_TOPIC_URL#}={TOPIC_ID}&amp;mode=split" />
+	<input type="hidden" name="{#POST_FORUM_URL#}" value="{FORUM_ID}" />
+	<input type="hidden" name="{#POST_TOPIC_URL#}" value="{TOPIC_ID}" />
 	<input type="hidden" name="start" value="{START}" />
 	<input type="hidden" name="mode" value="split" />
 
@@ -595,7 +595,7 @@ function build_poll_add_form (src_el)
 <br>
 <form action="{QR_POST_ACTION}" method="post" name="post" onsubmit="if(checkForm(this)){ dis_submit_btn(); }else{ return false; }">
 <input type="hidden" name="mode" value="reply" />
-<input type="hidden" name="{POST_TOPIC_URL}" value="{QR_TOPIC_ID}" />
+<input type="hidden" name="{#POST_TOPIC_URL#}" value="{QR_TOPIC_ID}" />
 
 <table id="topic_quick_reply" class="topic" cellpadding="0" cellspacing="0">
 <tr>
diff --git a/viewtopic.php b/viewtopic.php
index 6b8c613d8..77505b427 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -742,9 +742,7 @@ if (defined('SPLIT_FORM_START')) {
     $template->assign_vars([
         'SPLIT_FORM' => true,
         'START' => $start,
-        'S_SPLIT_ACTION' => 'modcp.php',
-        'POST_FORUM_URL' => POST_FORUM_URL,
-        'POST_TOPIC_URL' => POST_TOPIC_URL,
+        'S_SPLIT_ACTION' => 'modcp.php'
     ]);
 }