diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70db065d0..587590885 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 **Merged pull requests:**
 
+- Some improvements in default template [\#1159](https://github.com/torrentpier/torrentpier/pull/1159) ([belomaxorka](https://github.com/belomaxorka))
 - Use sent port instead of source [\#1158](https://github.com/torrentpier/torrentpier/pull/1158) ([kovalensky](https://github.com/kovalensky))
 - Remove unnecessary meta tags from file listing [\#1157](https://github.com/torrentpier/torrentpier/pull/1157) ([kovalensky](https://github.com/kovalensky))
 - Use different file listing url parameters for effective indexing by search engines [\#1156](https://github.com/torrentpier/torrentpier/pull/1156) ([kovalensky](https://github.com/kovalensky))
diff --git a/styles/templates/default/index.tpl b/styles/templates/default/index.tpl
index 58f4f0872..1141eca29 100644
--- a/styles/templates/default/index.tpl
+++ b/styles/templates/default/index.tpl
@@ -78,7 +78,7 @@
 		<!-- BEGIN f -->
 		<tr>
 			<td class="row1 f_icon">
-			<a href="search.php?f={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}?f={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">
 
@@ -92,7 +92,7 @@
 				<p class="subforums">
 					<em>{L_SUBFORUMS}:</em>
 					<!-- BEGIN sf -->
-					<span class="sf_title{c.f.sf.SF_NEW}"><a href="search.php?f={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}?f={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 7621c84f6..2fa89cea7 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', 'viewforum.php?f='+ f_id)
+			.attr('href', '{U_FORUM}?f='+ f_id)
 			.before('<img class="feed-small" src="{IMG}feed.png" alt="feed" onclick="open_feed('+ f_id +')">')
 		;
 	});
diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl
index be487c50b..4d574c94f 100644
--- a/styles/templates/default/page_header.tpl
+++ b/styles/templates/default/page_header.tpl
@@ -306,9 +306,9 @@ function go_to_page ()
 				<input type="hidden" name="to" value="1" />
 				<input id="search-text" type="text" name="nm" placeholder="{L_SEARCH_S}" required />
 				<select id="search-action">
-					<option value="tracker.php#results" selected> {L_TRACKER_S} </option>
-					<option value="search.php"> {L_FORUM_S} </option>
-					<option value="tracker.php" class="hash"> {L_HASH_S} </option>
+					<option value="{U_TRACKER}#results" selected> {L_TRACKER_S} </option>
+					<option value="{U_SEARCH}"> {L_FORUM_S} </option>
+					<option value="{U_TRACKER}" class="hash"> {L_HASH_S} </option>
 				</select>
 				<input type="submit" class="med" value="{L_SEARCH}" style="width: 55px;" />
 			</form>
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index b2713d9da..10e6305c4 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -261,7 +261,7 @@ function build_poll_add_form (src_el)
 		</td>
 
 		<td class="nowrap" style="padding: 0 4px 2px 4px;">
-			<form action="search.php?t={TOPIC_ID}&amp;dm=1&amp;s=1" method="post">
+			<form action="{U_SEARCH}?t={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>