diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 2bbe76488e..9e1085df25 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -36,7 +36,7 @@ field_metadata = FieldMetadata()
 class SafeFormat(TemplateFormatter):
     def get_value(self, key, args, mi):
         try:
-            ign, v = mi.format_field(key, series_with_index=False)
+            ign, v = mi.format_field(key.lower(), series_with_index=False)
             if v is None:
                 return ''
             if v == '':
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index bab2a59b1c..fe64a33c47 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -724,7 +724,7 @@ class BooksModel(QAbstractTableModel): # {{{
         elif typ == 'series':
             val, s_index = parse_series_string(self.db, label, value.toString())
         elif typ == 'composite':
-            tmpl = unicode(value.toString()).lower().strip()
+            tmpl = unicode(value.toString()).strip()
             disp = cc['display']
             disp['composite_template'] = tmpl
             self.db.set_custom_column_metadata(cc['colnum'], display = disp)
diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py
index a0f739e4c2..11922b7154 100644
--- a/src/calibre/library/save_to_disk.py
+++ b/src/calibre/library/save_to_disk.py
@@ -108,8 +108,8 @@ class SafeFormat(TemplateFormatter):
     '''
     def get_value(self, key, args, kwargs):
         try:
-            if kwargs[key]:
-                return kwargs[key]
+            if kwargs[key.lower()]:
+                return kwargs[key.lower()]
             return ''
         except:
             return ''