diff --git a/anki/deck.py b/anki/deck.py
index 0e4f9e2fb..9f5ea6249 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -1153,7 +1153,7 @@ select id, lastFontColour from cardModels""")])
         # field remapping
         if fieldMap:
             changed = True
-            self.startProgress(len(fieldMap)+1)
+            self.startProgress(len(fieldMap)+2)
             seen = {}
             for (old, new) in fieldMap.items():
                 self.updateProgress(_("Changing fields..."))
@@ -1221,6 +1221,8 @@ where id in %s""" % ids2str(ids), new=new.id, ord=new.ordinal)
         self.updateCardQACacheFromIds(factIds, type="facts")
         self.flushMod()
         self.updateProgress()
+        self.updateCardTags()
+        self.updateProgress()
         self.rebuildCounts()
         self.refresh()
         self.finishProgress()