diff --git a/anki/collection.py b/anki/collection.py
index 0db3cf494..8da21beba 100644
--- a/anki/collection.py
+++ b/anki/collection.py
@@ -575,8 +575,7 @@ where c.nid = n.id and c.id in %s group by nid""" % ids2str(cids)):
             where = ""
         else:
             raise Exception()
-        return [self._renderQA(row)
-                for row in self._qaData(where)]
+        return [self._renderQA(*row) for row in self._qaData(where)]
 
     def _renderQA(self, data: QAData, qfmt: None = None, afmt: None = None) -> Dict:
         "Returns hash of id, question, answer."
@@ -605,13 +604,14 @@ where c.nid = n.id and c.id in %s group by nid""" % ids2str(cids)):
         afmt = afmt or template['afmt']
         for (type, format) in (("q", qfmt), ("a", afmt)):
             if type == "q":
-                format = re.sub("{{(?!type:)(.*?)cloze:", r"{{\1cq-%d:" % (data[4]+1), format)
-                format = format.replace("<%cloze:", "<%%cq:%d:" % (
-                    data[4]+1))
+                format = re.sub("{{(?!type:)(.*?)cloze:",
+                                r"{{\1cq-%d:" % (data[4]+1), format)
+                format = format.replace("<%cloze:", "<%%cq:%d:" % (data[4]+1))
             else:
-                format = re.sub("{{(.*?)cloze:", r"{{\1ca-%d:" % (data[4]+1), format)
-                format = format.replace("<%cloze:", "<%%ca:%d:" % (
-                    data[4]+1))
+                format = re.sub(
+                    "{{(.*?)cloze:", r"{{\1ca-%d:" % (data[4]+1), format)
+                format = format.replace(
+                    "<%cloze:", "<%%ca:%d:" % (data[4]+1))
                 fields['FrontSide'] = stripSounds(d['q'])
             fields = runFilter("mungeFields", fields, model, data, self)
             html = anki.template.render(format, fields)