diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 35abe84319..354678c511 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1122,7 +1122,8 @@ class BooksModel(QAbstractTableModel):  # {{{
             disp['composite_template'] = tmpl
             self.db.set_custom_column_metadata(cc['colnum'], display=disp,
                                                update_last_modified=True)
-            self.refresh(reset=True)
+            self.refresh(reset=False)
+            self.research(reset=True)
             return True
 
         id = self.db.id(row)
diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index a6585cb0c3..046496dda5 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -877,7 +877,7 @@ class TagsView(QTreeView):  # {{{
                             search_submenu.addAction(self.search_copy_icon,
                                      _('The saved search expression'),
                                      partial(self.context_menu_handler, action='raw_search',
-                                             key=tag.name))
+                                             key=tag.original_name))
                     self.context_menu.addSeparator()
                 elif key.startswith('@') and not item.is_gst:
                     if item.can_be_edited: