Index: bb-templates/kakumei/search.php
===================================================================
--- bb-templates/kakumei/search.php	(revision 2439)
+++ bb-templates/kakumei/search.php	(working copy)
@@ -28,9 +28,9 @@
 	<ol>
 <?php foreach ( $relevant as $topic ) : ?>
 		<li<?php alt_class( 'relevant' ); ?>>
-			<a class="result" href="<?php post_link( $topic->post_id ); ?>"><?php echo bb_show_topic_context( $q, get_topic_title() ); ?></a>
-			<span class="freshness"><?php printf( __( 'Posted by <a href="%1$s">%2$s</a> on %3$s' ), get_user_profile_link( $topic->topic_id ), get_topic_author(), bb_datetime_format_i18n( get_topic_start_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
-			<p><?php echo bb_show_context( $q, $topic->post_text ); ?></p>
+			<a class="result" href="<?php topic_last_post_link(); ?>"><?php echo bb_show_topic_context( $q, get_topic_title() ); ?></a>
+			<span class="freshness"><?php printf( __( 'Posted by <a href="%1$s">%2$s</a> on %3$s' ), get_user_profile_link( $topic->topic_last_poster ), get_topic_last_poster(), bb_datetime_format_i18n( get_topic_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
+			<p><?php echo bb_show_context( $q, bb_get_post( $topic->topic_last_post_id )->post_text ); ?></p>
 		</li>
 <?php endforeach; ?>
 	</ol>
Index: search.php
===================================================================
--- search.php	(revision 2439)
+++ search.php	(working copy)
@@ -28,7 +28,7 @@
 	/* Relevant */
 	$bb_query_form->BB_Query_Form( 'topic', array( 'search' => $q ), array( 'page' => 1, 'post_status' => 0, 'topic_status' => 0, 'search', 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_relevant_search' );
 	$relevant = $bb_query_form->results;
-	if ( $recent ) {
+	if ( $relevant ) {
 		$relevant_count = isset( $bb_query_form->count ) ? $bb_query_form->count : count( $relevant );
 		$relevant = array_slice( $relevant, $search_start, $search_stop );
 	} else {
@@ -56,4 +56,4 @@
 
 bb_load_template( 'search.php', array( 'q', 'recent', 'relevant', 'page', 'search_count' ), $q );
 
-?>
+?>
\ No newline at end of file
