diff --git a/anki/deck.py b/anki/deck.py
index ae0c94a7b..b6834979e 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -1200,14 +1200,15 @@ where cardModelId in %s""" % strids, now=time.time())
     def tagsList(self, where="", priority=", cards.priority"):
         "Return a list of (cardId, allTags, priority)"
         return self.s.all("""
-select cards.id, cards.tags || "," || facts.tags || "," || models.tags || "," ||
+select cards.id, facts.tags || "," || models.tags || "," ||
 cardModels.name %s from cards, facts, models, cardModels where
 cards.factId == facts.id and facts.modelId == models.id
 and cards.cardModelId = cardModels.id %s""" % (priority, where))
 
     def shortTagsList(self, where=""):
+        # no card model
         return self.s.all("""
-select cards.id, cards.tags || "," || facts.tags || "," || models.tags
+select cards.id, facts.tags || "," || models.tags
 from cards, facts, models where
 cards.factId == facts.id and facts.modelId == models.id
 %s""" % where)
@@ -1215,27 +1216,20 @@ cards.factId == facts.id and facts.modelId == models.id
     def cardsWithNoTags(self):
         return self.s.column0("""
 select cards.id from cards, facts where
-cards.tags = "" and facts.tags = ""
+facts.tags = ""
 and cards.factId = facts.id""")
 
     def allTags(self):
-        "Return a hash listing tags in model, fact and cards."
+        "Return a hash listing tags in model & fact."
         return list(set(parseTags(",".join([x[1] for x in self.tagsList()]))))
 
-    def cardTags(self, ids):
-        return self.s.all("""
-select id, tags from cards
-where id in %s""" % ids2str(ids))
-
     def factTags(self, ids):
         return self.s.all("""
 select id, tags from facts
 where id in %s""" % ids2str(ids))
 
-    def addCardTags(self, ids, tags, idfunc=None, table="cards"):
-        if not idfunc:
-            idfunc=self.cardTags
-        tlist = idfunc(ids)
+    def addTags(self, ids, tags):
+        tlist = self.factTags(ids)
         newTags = parseTags(tags)
         now = time.time()
         pending = []
@@ -1246,20 +1240,15 @@ where id in %s""" % ids2str(ids))
                 pending.append(
                     {'id': id, 'now': now, 'tags': ", ".join(tmpTags)})
         self.s.statements("""
-update %s set
+update facts set
 tags = :tags,
 modified = :now
-where id = :id""" % table, pending)
-        self.updateCardQACacheFromCardIds([x[0] for x in tlist], type=table)
+where id = :id""", pending)
+        self.updateCardQACacheFromCardIds([x[0] for x in tlist], type="facts")
         self.flushMod()
 
-    def addFactTags(self, ids, tags):
-        self.addCardTags(ids, tags, idfunc=self.factTags, table="facts")
-
-    def deleteCardTags(self, ids, tags, idfunc=None, table="cards"):
-        if not idfunc:
-            idfunc=self.cardTags
-        tlist = idfunc(ids)
+    def deleteTags(self, ids, tags):
+        tlist = self.factTags(ids)
         newTags = parseTags(tags)
         now = time.time()
         pending = []
@@ -1275,16 +1264,13 @@ where id = :id""" % table, pending)
                 pending.append(
                     {'id': id, 'now': now, 'tags': ", ".join(tmpTags)})
         self.s.statements("""
-update %s set
+update facts set
 tags = :tags,
 modified = :now
-where id = :id""" % table, pending)
-        self.updateCardQACacheFromCardIds([x[0] for x in tlist], type=table)
+where id = :id""", pending)
+        self.updateCardQACacheFromCardIds([x[0] for x in tlist], type="facts")
         self.flushMod()
 
-    def deleteFactTags(self, ids, tags):
-        self.deleteCardTags(ids, tags, idfunc=self.factTags, table="facts")
-
     # File-related
     ##########################################################################
 
diff --git a/anki/importing/anki10.py b/anki/importing/anki10.py
index 600abc7fc..b7c01a7c3 100644
--- a/anki/importing/anki10.py
+++ b/anki/importing/anki10.py
@@ -52,7 +52,7 @@ class Anki10Importer(Importer):
             bulkClient.sync()
         # add tags
         fids = [f[0] for f in res['added-facts']['facts']]
-        self.deck.addFactTags(fids, self.tagsToAdd)
+        self.deck.addTags(fids, self.tagsToAdd)
         self.total = len(res['added-facts']['facts'])
         src.s.rollback()
         self.deck.flushMod()
diff --git a/anki/media.py b/anki/media.py
index 281ce25a6..bf7a14b22 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -149,10 +149,10 @@ def rebuildMediaDir(deck, deleteRefs=False, dirty=True):
     # fix tags
     if dirty:
         if deleteRefs:
-            deck.deleteFactTags(modifiedFacts.keys(), _("Media Missing"))
+            deck.deleteTags(modifiedFacts.keys(), _("Media Missing"))
         else:
-            deck.addFactTags(modifiedFacts.keys(), _("Media Missing"))
-        deck.deleteFactTags(unmodifiedFacts.keys(), _("Media Missing"))
+            deck.addTags(modifiedFacts.keys(), _("Media Missing"))
+        deck.deleteTags(unmodifiedFacts.keys(), _("Media Missing"))
     # build cache of db records
     mediaIds = dict(deck.s.all("select filename, id from media"))
     # look through the media dir for any unused files, and delete