diff --git a/upload/config.php b/upload/config.php
index c8548aee8..bcd61b77f 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,7 +56,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R447';
+$bb_cfg['tp_release_state'] = 'R448';
 $bb_cfg['tp_release_date'] = '03-09-2012';
 
 // Database
diff --git a/upload/templates/default/tracker.tpl b/upload/templates/default/tracker.tpl
index c2c264a68..00c1779be 100644
--- a/upload/templates/default/tracker.tpl
+++ b/upload/templates/default/tracker.tpl
@@ -288,7 +288,7 @@ $(function(){
 				<legend>{L_TITLE_MATCH}</legend>
 				<div>
 					<p class="input">
-						<input style="width: 95%;" class="post" type="text" size="50" maxlength="{TITLE_MATCH_MAX}" name="{TITLE_MATCH_NAME}" value="{TITLE_MATCH_VAL}" />
+						<input style="width: 95%;" class="post" type="text" size="50" maxlength="{TITLE_MATCH_MAX}" name="{TITLE_MATCH_NAME}" value="{TITLE_MATCH_VAL}" required />
 					</p>
 					<p class="chbox med">
 						{ALL_WORDS_CHBOX}
diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl
index 695634f64..9dd6b7c82 100644
--- a/upload/templates/default/viewforum.tpl
+++ b/upload/templates/default/viewforum.tpl
@@ -410,12 +410,12 @@ td.topic_id { cursor: pointer; }
 		</td>
 
 		<td class="nowrap" style="padding: 0px 4px 2px 4px;">
-			<form action="{PAGE_URL}" method="post" onsubmit="var txt=$('#search-text').val(); return !(txt=='{L_TITLE_SEARCH_HINT}' || !txt);">
+			<form action="{PAGE_URL}" method="post">
 				<input id="search-text" type="text" name="nm"
 				<!-- IF TITLE_MATCH -->
-					value="{TITLE_MATCH}" <!-- IF FOUND_TOPICS -->class="found"<!-- ELSE -->class="error"<!-- ENDIF -->
+					value="{TITLE_MATCH}" required <!-- IF FOUND_TOPICS -->class="found"<!-- ELSE -->class="error"<!-- ENDIF -->
 				<!-- ELSE -->
-					value="{L_TITLE_SEARCH_HINT}" class="hint"
+					placeholder="{L_TITLE_SEARCH_HINT}" required class="hint"
 				<!-- ENDIF -->
 				style="width: 150px;" />
 				<input type="submit" class="bold" value="&raquo;" style="width: 30px;" />
diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl
index 61ebf20fd..d340fc368 100644
--- a/upload/templates/default/viewtopic.tpl
+++ b/upload/templates/default/viewtopic.tpl
@@ -90,11 +90,13 @@ function set_hid_chbox (id)
 var $tt_td = $('.maintitle');
 function edit_topic_title (mode)
 {
-	if (mode == 'edit') {
		var tt_text = $tt_td.find('.tt-text').text();
+	if (mode == 'edit') {
+		var tt_text = $tt_td.find('.tt-text').text();
 
 		ajax.tte_orig_html = $tt_td.html();
 		$tt_td.html( $('#tt-edit-tpl').html() );
-		$('.tt-edit-input', $tt_td).val(tt_text).focus();
	}
+		$('.tt-edit-input', $tt_td).val(tt_text).focus();
+	}
 	else if (mode == 'save') {
 		var topic_title = $('.tt-edit-input', $tt_td).val();
 
@@ -181,8 +183,8 @@ ajax.callback.mod_action = function(data) {
 		</td>
 
 		<td class="nowrap" style="padding: 0px 4px 2px 4px;">
-			<form action="search.php?t={TOPIC_ID}&amp;dm=1&amp;s=1" method="post" onsubmit="var txt=$('#search-text').val(); return !(txt=='{L_SEARCH_IN_TOPIC}' || !txt);">
-				<input id="search-text" type="text" name="nm" value="{L_SEARCH_IN_TOPIC}" class="hint" style="width: 150px;" />
+			<form action="search.php?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>
 		</td>