--- a/plugins/SpecialSearch.php	Tue Sep 04 08:25:48 2007 -0400
+++ b/plugins/SpecialSearch.php	Tue Sep 04 12:52:23 2007 -0400
@@ -71,7 +71,7 @@
       {
         $not[$i] = '-' . $not[$i];
       }
-      $q .= implode(' ', $not);
+      $q .= implode(' ', $not) . ' ';
     }
     if(!empty($_GET['require_words']))
     {
@@ -80,7 +80,7 @@
       {
         $req[$i] = '+' . $req[$i];
       }
-      $q .= implode(' ', $req);
+      $q .= implode(' ', $req) . ' ';
     }
   }
   $q = trim($q);
@@ -244,6 +244,9 @@
         <?php if ( $session->sid_super ): ?>
           <input type="hidden" name="auth" value="<?php echo $session->sid_super; ?>" />
         <?php endif; ?>
+        <?php if ( urlSeparator == '&' ): ?>
+          <input type="hidden" name="title" value="<?php echo $paths->nslist['Special'] . 'Search'; ?>" />
+        <?php endif; ?>
         <input type="text" name="q" size="40" value="<?php echo htmlspecialchars( $q ); ?>" /> <input type="submit" value="Go" style="font-weight: bold;" /> <input name="search" type="submit" value="Search" />  <small><a href="<?php echo makeUrlNS('Special', 'Search'); ?>">Advanced Search</a></small>
       </p>
     </form>
@@ -254,6 +257,9 @@
   ?>
     <br />
     <form action="<?php echo makeUrl($paths->page); ?>" method="get">
+      <?php if ( urlSeparator == '&' ): ?>
+        <input type="hidden" name="title" value="<?php echo $paths->nslist['Special'] . 'Search'; ?>" />
+      <?php endif; ?>
       <div class="tblholder">
         <table border="0" style="width: 100%;" cellspacing="1" cellpadding="4">
           <tr><th colspan="2">Advanced Search</th></tr>