diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 3be37d922e..1681789528 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -529,8 +529,8 @@ class Metadata(object): for t in st.intersection(ot): sidx = lstags.index(t) oidx = lotags.index(t) - self_tags[sidx] = other.tags[oidx] - self_tags += [t for t in other.tags if t.lower() in ot-st] + self_tags[sidx] = other_tags[oidx] + self_tags += [t for t in other_tags if t.lower() in ot-st] setattr(self, x, self_tags) my_comments = getattr(self, 'comments', '') diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py index 7ed6b473ab..ee27b46080 100644 --- a/src/calibre/gui2/tag_browser/model.py +++ b/src/calibre/gui2/tag_browser/model.py @@ -394,7 +394,7 @@ class TagsModel(QAbstractItemModel): # {{{ not fm['is_custom'] and \ not fm['kind'] == 'user' \ else False - in_uc = fm['kind'] == 'user' + in_uc = fm['kind'] == 'user' and not is_gst tt = key if in_uc else None if collapse_model == 'first letter':