diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index a35d589b..14f24c19 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -70,7 +70,7 @@ class SnapshotAdmin(admin.ModelAdmin):
         return super().get_queryset(request).prefetch_related('tags')
 
     def tag_list(self, obj):
-        return u", ".join(o.name for o in obj.tags.all())
+        return ', '.join(obj.tags.values_list('name', flat=True))
 
     def id_str(self, obj):
         return format_html(
diff --git a/archivebox/index/sql.py b/archivebox/index/sql.py
index 360a7309..844ebbf4 100644
--- a/archivebox/index/sql.py
+++ b/archivebox/index/sql.py
@@ -40,7 +40,8 @@ def write_link_to_sql_index(link: Link):
         while Snapshot.objects.filter(timestamp=info["timestamp"]).exists():
             info["timestamp"] = str(float(info["timestamp"]) + 1.0)
 
-    return Snapshot.objects.update_or_create(url=link.url, defaults=info)[0]
+    Snapshot.objects.update_or_create(url=link.url, defaults=info)
+    return Snapshot.objects.get(url=link.url)
 
 
 @enforce_types
@@ -72,9 +73,7 @@ def write_sql_link_details(link: Link, out_dir: Path=OUTPUT_DIR) -> None:
         tag_list = list(tag_set) or []
 
         for tag in tag_list:
-            # TODO check empty tags
-            if snap.tags:
-                snap.tags.add(tag)
+            snap.tags.add(tag)
         snap.save()