diff --git a/book.php b/book.php
index 03f835d..1740e98 100644
--- a/book.php
+++ b/book.php
@@ -9,6 +9,7 @@
 require_once('base.php');
 require_once('serie.php');
 require_once('author.php');
+require_once('tag.php');
 
 class Book extends Base {
     const ALL_BOOKS_ID = "calibre:books";
@@ -89,7 +90,7 @@ class Book extends Base {
         if (is_null ($this->tags)) {
             $this->tags = array ();
             
-            $result = parent::getDb ()->prepare('select name
+            $result = parent::getDb ()->prepare('select tags.id as id, name
                 from books_tags_link, tags
                 where tag = tags.id
                 and book = ?
@@ -97,7 +98,7 @@ class Book extends Base {
             $result->execute (array ($this->id));
             while ($post = $result->fetchObject ())
             {
-                array_push ($this->tags, $post->name);
+                array_push ($this->tags, new Tag ($post->id, $post->name));
             }
         }
         return $this->tags;
@@ -107,11 +108,11 @@ class Book extends Base {
         $tagList = null;
         foreach ($this->getTags () as $tag) {
             if ($tagList) {
-                $tagList = $tagList . ", " . $tag;
+                $tagList = $tagList . ", " . $tag->name;
             }
             else
             {
-                $tagList = $tag;
+                $tagList = $tag->name;
             }
         }
         return $tagList;
diff --git a/bookdetail.php b/bookdetail.php
index b8ac8f6..9efd897 100644
--- a/bookdetail.php
+++ b/bookdetail.php
@@ -12,6 +12,7 @@ require_once ("book.php");
 
 $book = Book::getBookById($_GET["id"]);
 $authors = $book->getAuthors ();
+$tags = $book->getTags ();
  
 ?>
 <div class="bookpopup">
@@ -26,15 +27,26 @@ $authors = $book->getAuthors ();
         foreach ($authors as $author) {
             if ($i > 0) echo ", ";
 ?>
-            <a href="kobo.php<?php echo str_replace ("&", "&amp;", $author->getUri ()) ?>"><?php echo $author->name ?></a>
+            <a href="index.php<?php echo str_replace ("&", "&amp;", $author->getUri ()) ?>"><?php echo $author->name ?></a>
+<?php
+        }
+?>
+        </div>
+        <div class="tags">
+<?php
+        $i = 0;
+        foreach ($tags as $tag) {
+            if ($i > 0) echo ", ";
+?>
+            <a href="index.php<?php echo str_replace ("&", "&amp;", $tag->getUri ()) ?>"><?php echo $tag->name ?></a>
 <?php
         }
 ?>
         </div>
     </div>
     <div class="clearer" />
-    <div><?php echo localize("content.summary") ?></div>
     <hr />
+    <div><?php echo localize("content.summary") ?></div>
     <?php echo $book->getComment () ?>
     <hr />
 </div>
\ No newline at end of file