diff --git a/upload/config.php b/upload/config.php
index c6def124a..078bbc9f9 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 pre-stable';
-$bb_cfg['tp_release_date'] = '6-12-2012';
-$bb_cfg['tp_release_state'] = 'R481';
+$bb_cfg['tp_release_date'] = '21-12-2012';
+$bb_cfg['tp_release_state'] = 'R482';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/viewforum.php b/upload/viewforum.php
index a408210c7..6413e31dd 100644
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@@ -339,15 +339,15 @@ $title_match_sql = '';
 
 if ($title_match =& $_REQUEST[$title_match_key])
 {
-	if ($title_match = substr(trim($title_match), 0, $title_match_max_len))
+	if ($tmp = mb_substr(trim($title_match), 0, $title_match_max_len))
 	{
-		$search_bool_mode = ($bb_cfg['allow_search_in_bool_mode']) ? " IN BOOLEAN MODE" : '';
-		$search_text_sql = DB()->escape($title_match);
-		$title_match_sql = "
-			AND MATCH (t.topic_title) AGAINST ('$search_text_sql'". $search_bool_mode .")
-		";
-		$start = 0;
-		$forum_topics = $topics_per_page;
+		$title_match_val = clean_text_match($tmp, true, false, false);
+		$title_match_topics = get_title_match_topics($title_match_val, array(0 => $forum_id));
+
+		if ($search_match_topics_csv = join(',', $title_match_topics))
+		{
+			$title_match_sql = "AND t.topic_id IN($search_match_topics_csv)";
+		}
 	}
 }