diff --git a/cgi-bin/searchapi.cgi b/cgi-bin/searchapi.cgi
index 19e9436..4767e93 100755
--- a/cgi-bin/searchapi.cgi
+++ b/cgi-bin/searchapi.cgi
@@ -85,6 +85,9 @@ else
       [[ "${ITEM/$STORAGE_PREFIX}" =~  $REGEX ]] && continue 2
     done <<<"${IGNORE_REGEXES[@]}"
 
+    # Don't list the path searched for.
+    [[ "${ITEM/$STORAGE_PREFIX}" == "$QS_p" ]] && continue
+
     # List the item.
     printf "%s\\n" "${ITEM/$STORAGE_PREFIX}"
 
diff --git a/html/search.shtml b/html/search.shtml
index 6ba52b8..a2ae1c4 100644
--- a/html/search.shtml
+++ b/html/search.shtml
@@ -57,7 +57,7 @@
       <tr>
         <td class="search" align="right" valign="center">
           <form action="/search">
-            <input type="hidden" name="p" value="$X_p">
+            <input type="hidden" name="p" value="<?php print ($_GET["p"]) ?>">
             <input class="searchinput" title="Search" alt="Search Box" type="text" name="q" value="<?php print ($_GET["q"]) ?>" autocomplete="on" required>
           </form>
         </td>