diff --git a/upload/config.php b/upload/config.php
index 1770984b9..c95d2d406 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -55,8 +55,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 (unstable)';
-$bb_cfg['tp_release_date'] = '05-09-2013';
-$bb_cfg['tp_release_state'] = 'R552';
+$bb_cfg['tp_release_date'] = '03-11-2013';
+$bb_cfg['tp_release_state'] = 'R553';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/search.php b/upload/search.php
index c7f34d895..46ce161f2 100644
--- a/upload/search.php
+++ b/upload/search.php
@@ -697,9 +697,9 @@ else
 				bb_die($lang['NO_SEARCH_MATCH']);
 			}
 
-            $where_id = ($title_match) ? 'topic_id' : 'post_id';
+            $where_id = ($title_match) ? 't.topic_id' : 'p.post_id';
 
-			$SQL['WHERE'][] = "$tbl.$where_id IN($search_match_topics_csv)";
+			$SQL['WHERE'][] = "$where_id IN($search_match_topics_csv)";
 			prevent_huge_searches($SQL);
 		}