diff --git a/base.php b/base.php
index 10ca17b..4c0afc2 100644
--- a/base.php
+++ b/base.php
@@ -499,7 +499,15 @@ class PageQueryResult extends Page
     public function InitializeContent () 
     {
         $this->title = "Search result for query *" . $this->query . "*"; // TODO I18N
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByQuery ($this->query, $this->n);
+        $currentPage = getURLParam ("current", NULL);
+        switch ($currentPage) {
+            case Base::PAGE_ALL_AUTHORS :
+            case Base::PAGE_AUTHORS_FIRST_LETTER :
+                $this->entryArray = Author::getAuthorsByStartingLetter ('%' . $this->query);
+                break;
+            default:
+                list ($this->entryArray, $this->totalNumber) = Book::getBooksByQuery ($this->query, $this->n);
+        }
     }
 }
 
diff --git a/index.php b/index.php
index 2e8a042..020d3a7 100644
--- a/index.php
+++ b/index.php
@@ -167,11 +167,12 @@
     <div class="clearer" />
     <div id="tool" <?php if ($withToolbar) echo 'style="display: none"' ?>>
         <div style="float: left; width: 60%">
-            <form action="index.php?page=9" method="get">
+            <form action="index.php" method="get">
                 <div style="float: right">
                     <input type="image" src="images/search32.png" alt="Search" />
                 </div>
                 <div class="stop">
+                    <input type="hidden" name="current" value="<?php echo $page ?>" />
                     <input type="hidden" name="page" value="9" />
                     <input type="text" name="query" />
                 </div>