diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 98bed605a0..0cce33da9e 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -433,7 +433,7 @@ class BooksView(QTableView): # {{{
                     self.setItemDelegateForColumn(cm.index(colhead), delegate)
                 elif cc['datatype'] == 'comments':
                     self.setItemDelegateForColumn(cm.index(colhead), self.cc_comments_delegate)
-                elif cc['datatype'] in 'text':
+                elif cc['datatype'] == 'text':
                     if cc['is_multiple']:
                         if cc['display'].get('is_names', False):
                             self.setItemDelegateForColumn(cm.index(colhead),
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 8519e6a67d..b9acbd3979 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -696,8 +696,9 @@ class BrowseServer(object):
                                 xml(val if len(dbtags) == 1 else tag.name),
                                 xml(key, True)))
                         join = ' & ' if key == 'authors' or \
-                                            fm['display'].get('is_names', False) \
-                                        else ', '
+                                            (fm['is_custom'] and
+                                             fm['display'].get('is_names', False)) \
+                                         else ', '
                         args[key] = join.join(vals)
                         added_key = True
                 if not added_key: