diff --git a/CHANGES b/CHANGES
index 4710d33..931ccd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,3 +18,6 @@
 17.05.2008, Version 0.8.11_beta
 - Added a link to use Online-Bookmarks as a real Firefox Sidebar. Many thanks to Adam Patterson.
 - You can find the link "Change Password" under "Settings" from now on.
+- Added completelly new search lib. Many thanks to John-Paul Durrieu as well for other
+  hints and suggestions.
+
diff --git a/export.php b/export.php
index 8236ec3..fd74989 100644
--- a/export.php
+++ b/export.php
@@ -124,6 +124,7 @@ if (!isset ($_POST['browser']) || $_POST['browser'] == "" ||
 </div>
 
 <?php
+	print_footer ();
 	require_once (ABSOLUTE_PATH . "footer.php");
 }
 
diff --git a/lib/BooleanSearch.php b/lib/BooleanSearch.php
index 2bb9ada..7900056 100644
--- a/lib/BooleanSearch.php
+++ b/lib/BooleanSearch.php
@@ -1,4 +1,7 @@
 <?php
+/**
+* Search lib by John-Paul Durrieu
+*/
 
 // Token types
 define("TOKEN_STRING",       0);
diff --git a/settings.php b/settings.php
index 8059062..f924361 100644
--- a/settings.php
+++ b/settings.php
@@ -372,5 +372,6 @@ function check_date_format () {
 </div>
 
 <?php
+print_footer ();
 require_once (ABSOLUTE_PATH . "footer.php");
 ?>
diff --git a/shared.php b/shared.php
index a3c1079..619653c 100644
--- a/shared.php
+++ b/shared.php
@@ -40,7 +40,6 @@ else {
 			<li><a href="./export.php">Export</a></li>
 			<li><a href="./sidebar.php">View as Sidebar</a></li>
 			<li><a href="./settings.php">Settings</a></li>
-			<li><a href="javascript:chpw()">Change Password</a></li>
 			<li><a href="./index.php?logout=1">Logout</a></li>
 			<?php } else { ?>
 			<li><a href="./index.php">Login</a></li>
@@ -114,7 +113,7 @@ if (isset ($_GET['user']) && check_username ($user)) {
 <?php
 }
 else {
-				echo '<div id="content">';
+				echo '<div id="content">' . "\n";
         $query = "SELECT user, SUM(bookmarks) AS bookmarks, SUM(folders) AS folders FROM (
                 SELECT user, 1 AS bookmarks, 0 AS folders FROM bookmark WHERE public='1' AND deleted!='1'
                 UNION ALL
@@ -130,7 +129,7 @@ else {
         else {
                 message ($mysql->error);
         }
-				echo "<div>";
+				echo "</div>";
 }
 ?>
 
@@ -139,12 +138,7 @@ else {
 <!-- Wrapper ends here. -->
 </div>
 
-
-
-
-
-
-
 <?php
+print_footer ();
 require_once (ABSOLUTE_PATH . "footer.php");
 ?>