diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 16819cbd39..2bbe76488e 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -99,7 +99,7 @@ class Metadata(object):
                     continue
                 cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field
                 cf['#value#'] = composite_formatter.safe_format(
-                                            d['display']['composite_template'],
+                                            cf['display']['composite_template'],
                                             self, _('TEMPLATE ERROR')).strip()
             return d['#value#']
 
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index fd5809f937..fde57e2a2e 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -584,9 +584,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         mi.title_sort  = self.title_sort(idx, index_is_id=index_is_id)
         mi.formats     = self.formats(idx, index_is_id=index_is_id,
                                                         verify_formats=False)
-        if hasattr(mi.formats, 'split'):
-            mi.formats = mi.formats.split(',')
-        else:
+        if len(mi.formats) == 0:
             mi.formats = None
         tags = self.tags(idx, index_is_id=index_is_id)
         if tags: