diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py
index 3d313b5..02371dc 100755
--- a/dlibrary/dlibrary.py
+++ b/dlibrary/dlibrary.py
@@ -7,6 +7,7 @@ from pathlib import Path
 import os
 from os.path import relpath, splitext
 import re
+import readline
 import shutil
 import sqlite3
 import textwrap
@@ -101,8 +102,8 @@ async def fetch_async(args):
     cur = con.cursor()
 
     cur.execute("CREATE TABLE IF NOT EXISTS works(id TEXT PRIMARY KEY, title TEXT, circle TEXT, date TEXT, description TEXT, series TEXT, virtual INT)")
-    cur.execute("CREATE TABLE IF NOT EXISTS authors(author TEXT, work TEXT, FOREIGN KEY(work) REFERENCES works(id))")
-    cur.execute("CREATE TABLE IF NOT EXISTS tags(tag TEXT, work TEXT, FOREIGN KEY(work) REFERENCES works(id))")
+    cur.execute("CREATE TABLE IF NOT EXISTS authors(author TEXT, work TEXT, FOREIGN KEY(work) REFERENCES works(id), PRIMARY KEY(author, work))")
+    cur.execute("CREATE TABLE IF NOT EXISTS tags(tag TEXT, work TEXT, FOREIGN KEY(work) REFERENCES works(id), PRIMARY KEY(tag, work))")
 
     thumbnails_dir = args.destdir / 'site' / 'thumbnails'
     thumbnails_dir.mkdir(parents=True, exist_ok=True)
diff --git a/dlibrary/templates/work.html b/dlibrary/templates/work.html
index 2bedfb2..c2860fa 100644
--- a/dlibrary/templates/work.html
+++ b/dlibrary/templates/work.html
@@ -36,7 +36,9 @@
       </tr>
       {% endif %}
     </table>
+    {% if work['description'] %}
     {{ work['description'] }}
+    {% endif %}
   </div>
 </div>
 {% endblock %}