Index: bb-templates/kakumei/search.php
===================================================================
--- bb-templates/kakumei/search.php	(revision 2439)
+++ bb-templates/kakumei/search.php	(working copy)
@@ -14,7 +14,7 @@
 <?php foreach ( $recent as $bb_post ) : ?>
 		<li<?php alt_class( 'recent' ); ?>>
 			<a class="result" href="<?php post_link(); ?>"><?php echo bb_show_topic_context( $q, get_topic_title( $bb_post->topic_id ) ); ?></a>
-			<span class="freshness"><?php printf( __( 'Posted by <a href="%1$s">%2$s</a> on %3$s'), get_user_profile_link( $bb_post->poster_id ), get_post_author(), bb_datetime_format_i18n( bb_get_post_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
+			<span class="freshness"><?php printf( __( 'By <a href="%1$s">%2$s</a> on %3$s'), get_user_profile_link( $bb_post->poster_id ), get_post_author(), bb_datetime_format_i18n( bb_get_post_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
 			<p><?php echo bb_show_context( $q, $bb_post->post_text ); ?></p>
 		</li>
 <?php endforeach; ?>
@@ -27,16 +27,19 @@
 	<h4><?php _e( 'Relevant Topics' )?></h4>
 	<ol>
 <?php foreach ( $relevant as $topic ) : ?>
+<?php $bb_post = bb_get_first_post( $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 post_link(); ?>"><?php echo bb_show_topic_context( $q, get_topic_title() ); ?></a>
+			<span class="freshness"><?php printf( __( 'By <a href="%1$s">%2$s</a> on %3$s' ), get_user_profile_link( $topic->topic_poster ), get_topic_author(), bb_datetime_format_i18n( get_topic_start_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
+			<p><?php echo bb_show_context( $q, $bb_post->post_text ); ?></p>
 		</li>
 <?php endforeach; ?>
 	</ol>
 </div>
 <?php endif; ?>
 
+<?php bb_search_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?>
+
 <?php if ( $q && !$recent && !$relevant ) : ?>
 <p><?php printf( __( 'Your search %s did not return any results. Here are some suggestions:' ), '&#8220;<em>' . esc_html( $q ) . '</em>&#8221;' ); ?></p>
 <ul id="search-suggestions">
@@ -44,9 +47,6 @@
     <li><?php _e( 'Try different keywords' ); ?></li>
     <li><?php _e( 'Try more general keywords' ); ?></li>
 </ul>
-<?php else: ?>
-	<?php bb_search_pages(); ?>
-	<br />
 <?php endif; ?>
 
 <br />
Index: bb-includes/functions.bb-template.php
===================================================================
--- bb-includes/functions.bb-template.php	(revision 2439)
+++ bb-includes/functions.bb-template.php	(working copy)
@@ -1642,9 +1642,14 @@
 	$query_obj->form( $args );
 }
 
-function bb_search_pages() {
+function bb_search_pages( $args = null ) {
+	$defaults = array( 'before' => '', 'after' => '' );
+	$args = wp_parse_args( $args, $defaults );
+
 	global $page, $search_count;
-	echo apply_filters( 'bb_search_pages', get_page_number_links( array( 'page' => $page, 'total' => $search_count, 'per_page' => 5, 'mod_rewrite' => false ) ) );
+
+	if ( $pages = apply_filters( 'bb_search_pages', get_page_number_links( array( 'page' => $page, 'total' => $search_count, 'per_page', 'mod_rewrite' => false ) ) ) )
+		echo $args['before'] . $pages . $args['after'];
 }
 
 /**
Index: search.php
===================================================================
--- search.php	(revision 2439)
+++ search.php	(working copy)
@@ -8,35 +8,33 @@
 
 if ( $q = stripslashes( $q ) ) {
 	/* Paging hack */
-	global $page;
-	if ( !$page ) $page = 1;
-	$search_start = 5 * ( $page - 1);
-	$search_stop = 5;
-	
+	//global $page;
+	//if ( !$page ) $page = 1;
+	//$search_start = 5 * ( $page - 1 );
+	//$search_stop = 5;
+
 	/* Recent */
 	add_filter( 'bb_recent_search_fields',   create_function( '$f', 'return $f . ", MAX(post_time) AS post_time";' ) );
 	add_filter( 'bb_recent_search_group_by', create_function( '', 'return "t.topic_id";' ) );
-	$bb_query_form->BB_Query_Form( 'post', array(), array( 'order_by' => 'p.post_time', 'page' => 1, 'post_status' => 0, 'topic_status' => 0, 'post_text' => $q, 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_recent_search' );
+	$bb_query_form->BB_Query_Form( 'post', array(), array( 'order_by' => 'p.post_time', /*'page' => 1, */'per_page' => 5, 'post_status' => 0, 'topic_status' => 0, 'post_text' => $q, 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_recent_search' );
 	$recent = $bb_query_form->results;
 	if ( $recent ) {
 		$recent_count = isset( $bb_query_form->count ) ? $bb_query_form->count : count( $recent );
-		$recent = array_slice( $recent, $search_start, $search_stop );
-	} else {
+		//$recent = array_slice( $recent, $search_start, $search_stop );
+	} else
 		$recent_count = 0;
-	}
-	
+
 	/* 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' );
+	$bb_query_form->BB_Query_Form( 'topic', array( 'search' => $q ), array( /*'page' => 1, */'per_page' => 5, '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 {
+		//$relevant = array_slice( $relevant, $search_start, $search_stop );
+	} else
 		$relevant_count = 0;
-	}
-	
-	$search_count = max( $recent_count, $relevant_count );
-	
+
+	$search_count = max( $recent_count, $relevant_count ); // todo: fix this to be results total
+
 	$q = $bb_query_form->get( 'search' );
 }
 
@@ -54,6 +52,6 @@
 		$topics = bb_append_meta( $topics, 'topic' );
 endif;
 
-bb_load_template( 'search.php', array( 'q', 'recent', 'relevant', 'page', 'search_count' ), $q );
+bb_load_template( 'search.php', array( 'q', 'recent', 'relevant', /*'page', */'search_count' ), $q );
 
 ?>