diff --git a/Source/Source.FilterAPI.php b/Source/Source.FilterAPI.php
index 873f1b9..600c478 100644
--- a/Source/Source.FilterAPI.php
+++ b/Source/Source.FilterAPI.php
@@ -193,13 +193,14 @@
 	if ( is_array( $value ) ) {
 		$wc = map( 'db_aparam', $value );
 
-		if ( count( $value ) > 1 ) {
+		$count = count( $value );
+		if ( $count > 1 ) {
 			if ( SOURCE_ANY == $how ) {
 				$sql = $key . ' IN (' . implode( ',', $wc ) . ')';
 			} else {
 				$sql = $key . ' NOT IN (' . implode( ',', $wc ) . ')';
 			}
-		} else {
+		} elseif ( $count == 1 ) {
 			$wc = $wc[0];
 
 			if ( SOURCE_ANY == $how ) {
@@ -229,11 +230,11 @@
 	$f_repo_id = Source_FilterOption_Permalink( 'repo_id', true );
 	$f_branch = Source_FilterOption_Permalink( 'branch', true );
 	$f_file_action = Source_FilterOption_Permalink( 'file_action', true );
-	$f_user_id = Source_FilterOption_Permalink( 'user_id' );
 
 	$f_revision = Source_FilterOption_Permalink( 'revision' );
 	$f_author = Source_FilterOption_Permalink( 'author' );
 	$f_user_id = Source_FilterOption_Permalink( 'user_id' );
+	$f_bug_id = Source_FilterOption_Permalink( 'bug_id' );
 
 	$f_filename = Source_FilterOption_Permalink( 'filename' );
 	$f_message = Source_FilterOption_Permalink( 'message' );
@@ -252,6 +253,8 @@
 	$t_filter->filters['r.id']->value = $f_repo_id;
 	$t_filter->filters['r.type']->value = $f_repo_type;
 
+	$t_filter->filters['b.bug_id']->value = ( !is_blank( $f_bug_id ) ? split( '[ ,]', $f_bug_id ) : array() );
+
 	$t_filter->filters['f.filename']->value = $f_filename;
 	$t_filter->filters['f.revision']->value = $f_revision;
 	$t_filter->filters['f.action']->value = $f_file_action;
diff --git a/Source/pages/search_page.php b/Source/pages/search_page.php
index e0267b9..cf601d5 100644
--- a/Source/pages/search_page.php
+++ b/Source/pages/search_page.php
@@ -28,8 +28,8 @@
 <table class="width75" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
-<td class="right" colspan="3">
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
+<td class="right" colspan="5">
 <?php
 print_bracket_link( plugin_page( 'search_page' ), 'New Search' );
 ?>
@@ -52,31 +52,33 @@
 <tr class="spacer"><td></td></tr>
 
 <tr class="row-category">
-<td>Revision</td>
 <td>Author</td>
-<td colspan="2">Username</td>
+<td>Username</td>
+<td>Revision</td>
+<td>Bug #'s</td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="center"><input name="revision" size="10" value="<?php echo string_attribute( $t_filter->filters['f.revision']->value ) ?>"/></td>
 <td class="center"><?php Source_Author_Select( $t_filter->filters['c.author']->value ) ?></td>
-<td class="center" colspan="2"><?php Source_Username_Select( $t_filter->filters['c.user_id']->value ) ?></td>
+<td class="center"><?php Source_Username_Select( $t_filter->filters['c.user_id']->value ) ?></td>
+<td class="center"><input name="revision" size="10" value="<?php echo string_attribute( $t_filter->filters['f.revision']->value ) ?>"/></td>
+<td class="center"><input name="bug_id" size="10" value="<?php echo string_attribute( join( ',', $t_filter->filters['b.bug_id']->value ) ) ?>"/></td>
 </tr>
 
 <tr class="spacer"><td></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
 <td class="category">Message</td>
-<td colspan="3"><input name="message" size="40" value="<?php string_attribute( $t_filter->filters['c.message'] ) ?>"/></td>
+<td colspan="6"><input name="message" size="40" value="<?php echo string_attribute( $t_filter->filters['c.message']->value ) ?>"/></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
 <td class="category">Filenames</td>
-<td colspan="3"><input name="filename" size="40" value="<?php string_attribute( $t_filter->filters['f.filename'] ) ?>"/></td>
+<td colspan="6"><input name="filename" size="40" value="<?php echo string_attribute( $t_filter->filters['f.filename']->value ) ?>"/></td>
 </tr>
 
 <tr>
-<td class="center" colspan="3"><input type="submit"/></td>
+<td class="center" colspan="7"><input type="submit"/></td>
 </tr>
 
 </table>