diff --git a/base.php b/base.php
index 3279c4c..13f85d3 100644
--- a/base.php
+++ b/base.php
@@ -208,7 +208,7 @@ class Link
     }
     
     public function hrefXhtml () {
-        return str_replace ("&", "&", $this->href);
+        return $this->href;
     }
 }
 
diff --git a/book.php b/book.php
index dcfb1c9..3987026 100644
--- a/book.php
+++ b/book.php
@@ -173,7 +173,6 @@ class Book extends Base {
         global $config;
         $urlParam = $this->getUri ();
         if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
-        $urlParam = str_replace ("&", "&", $urlParam);
         return 'index.php' . $urlParam; 
     }
     
diff --git a/data.php b/data.php
index 0430bd8..5e08044 100644
--- a/data.php
+++ b/data.php
@@ -105,7 +105,7 @@ class Data extends Base {
         }
         else
         {
-            return str_replace ("&", "&", self::getLink ($this->book, $this->extension, $this->getMimeType (), NULL, $this->getFilename (), $this->id, NULL)->href);
+            return self::getLink ($this->book, $this->extension, $this->getMimeType (), NULL, $this->getFilename (), $this->id, NULL)->href;
         }
     }
     
diff --git a/getJSON.php b/getJSON.php
index 6147725..dbd4ce2 100644
--- a/getJSON.php
+++ b/getJSON.php
@@ -75,9 +75,9 @@
                        "sortorderAsc" => localize("search.sortorder.asc"),
                        "sortorderDesc" => localize("search.sortorder.desc")),
                    "url" => array (
-                       "detailUrl" => "index.php?page=13&id={0}&db={1}",
-                       "coverUrl" => "fetch.php?id={0}&db={1}",
-                       "thumbnailUrl" => "fetch.php?height=70&id={0}&db={1}"),
+                       "detailUrl" => "index.php?page=13&id={0}&db={1}",
+                       "coverUrl" => "fetch.php?id={0}&db={1}",
+                       "thumbnailUrl" => "fetch.php?height=70&id={0}&db={1}"),
                    "config" => array (
                        "use_fancyapps" => $config ["cops_use_fancyapps"],
                        "max_item_per_page" => $config['cops_max_item_per_page']));
@@ -89,7 +89,7 @@
     }
     $out["abouturl"] = "about.xml";
     if (getCurrentOption ('use_fancyapps') == 0) {
-        $out["abouturl"] = "index.php" . str_replace ("&", "&", addURLParameter ("?page=16", DB, $database));
+        $out["abouturl"] = "index.php" . addURLParameter ("?page=16", DB, $database);
     }
     
     $out ["homeurl"] = "index.php";
diff --git a/index.php b/index.php
index df1ea9d..fcc915c 100644
--- a/index.php
+++ b/index.php
@@ -22,7 +22,7 @@
         exit ();
     }
     
-    header ("Content-Type:application/xhtml+xml;charset=utf-8");
+    header ("Content-Type:text/html;charset=utf-8");
     $page = getURLParam ("page", Base::PAGE_INDEX);
     $query = getURLParam ("query");
     $qid = getURLParam ("id");
@@ -52,7 +52,7 @@
         $(document).ready(function() {
             // Handler for .ready() called.
             
-            var url = "<?php echo "getJSON.php?" . str_replace ("&", "&amp;", addURLParameter ($_SERVER["QUERY_STRING"], "complete", 1)); ?>";
+            var url = "<?php echo "getJSON.php?" . addURLParameter ($_SERVER["QUERY_STRING"], "complete", 1); ?>";
             
             $.when($.get('templates/default/header.html'),
                    $.get('templates/default/footer.html'),