diff --git a/src/calibre/library/coloring.py b/src/calibre/library/coloring.py
index c8cafcf9eb..8cfa085919 100644
--- a/src/calibre/library/coloring.py
+++ b/src/calibre/library/coloring.py
@@ -85,7 +85,7 @@ class Rule(object): # {{{
         if dt == 'datetime':
             return self.date_condition(col, action, val)
 
-        if dt in ('comments', 'series', 'text', 'enumeration'):
+        if dt in ('comments', 'series', 'text', 'enumeration', 'composite'):
             ism = m.get('is_multiple', False)
             if ism:
                 return self.multiple_condition(col, action, val, ism)
@@ -181,9 +181,7 @@ def rule_from_template(fm, template):
 def conditionable_columns(fm):
     for key in fm:
         m = fm[key]
-        dt = m['datatype']
-        if m.get('name', False) and dt in ('bool', 'int', 'float', 'rating', 'series',
-                'comments', 'text', 'enumeration', 'datetime'):
+        if m.get('name', False) and m['kind'] == 'field':
             if key == 'sort':
                 yield 'title_sort'
             else: