diff --git a/picard/mbxml.py b/picard/mbxml.py
index c719fe155..378df1459 100644
--- a/picard/mbxml.py
+++ b/picard/mbxml.py
@@ -209,10 +209,10 @@ def country_list_from_node(node):
     # Extracts iso_3166_1_codes for all countries in `release_event_list`
     if "release_event_list" in node.children:
         country = []
-        for re in node.release_event_list[0].release_event:
+        for release_event in node.release_event_list[0].release_event:
             try:
                 country.append(
-                    re.area[0].iso_3166_1_code_list[0].iso_3166_1_code[0].text)
+                    release_event.area[0].iso_3166_1_code_list[0].iso_3166_1_code[0].text)
             except AttributeError:
                 pass
         return country
diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
index d986985a2..35a57e95f 100644
--- a/picard/ui/itemviews.py
+++ b/picard/ui/itemviews.py
@@ -257,7 +257,7 @@ class BaseTreeView(QtGui.QTreeWidget):
             if obj.num_linked_files == 1:
                 menu.addAction(self.window.play_file_action)
                 menu.addAction(self.window.open_folder_action)
-                menu.addAction(self.window.tracks_search_action)
+                menu.addAction(self.window.track_search_action)
                 plugin_actions.extend(_file_actions)
             menu.addAction(self.window.browser_lookup_action)
             menu.addSeparator()
@@ -287,7 +287,7 @@ class BaseTreeView(QtGui.QTreeWidget):
             menu.addSeparator()
             menu.addAction(self.window.autotag_action)
             menu.addAction(self.window.analyze_action)
-            menu.addAction(self.window.tracks_search_action)
+            menu.addAction(self.window.track_search_action)
             plugin_actions = list(_file_actions)
         elif isinstance(obj, Album):
             if can_view_info:
diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index a59ab0125..80a26356c 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -382,13 +382,13 @@ class MainWindow(QtGui.QMainWindow):
         self.browser_lookup_action.setEnabled(False)
         self.browser_lookup_action.triggered.connect(self.browser_lookup)
 
-        self.albums_search_action = QtGui.QAction(icontheme.lookup('system-search'), _(u"Search similar albums..."), self)
-        self.albums_search_action.setStatusTip(_(u"View similar releases and optionally choose a different release"))
-        self.albums_search_action.triggered.connect(self.show_more_albums)
+        self.album_search_action = QtGui.QAction(icontheme.lookup('system-search'), _(u"Search for similar albums..."), self)
+        self.album_search_action.setStatusTip(_(u"View similar releases and optionally choose a different release"))
+        self.album_search_action.triggered.connect(self.show_more_albums)
 
-        self.tracks_search_action = QtGui.QAction(icontheme.lookup('system-search'), _(u"Search similar tracks..."), self)
-        self.tracks_search_action.setStatusTip(_(u"View similar tracks and optionally choose a different release"))
-        self.tracks_search_action.triggered.connect(self.show_more_tracks)
+        self.track_search_action = QtGui.QAction(icontheme.lookup('system-search'), _(u"Search for similar tracks..."), self)
+        self.track_search_action.setStatusTip(_(u"View similar tracks and optionally choose a different release"))
+        self.track_search_action.triggered.connect(self.show_more_tracks)
 
         self.show_file_browser_action = QtGui.QAction(_(u"File &Browser"), self)
         self.show_file_browser_action.setCheckable(True)
diff --git a/picard/ui/searchdialog.py b/picard/ui/searchdialog.py
index 590773b45..8794b966d 100644
--- a/picard/ui/searchdialog.py
+++ b/picard/ui/searchdialog.py
@@ -508,8 +508,8 @@ class AlbumSearchDialog(SearchDialog):
                 _("Tracks"),
                 _("Date"),
                 _("Country"),
-                _("Label"),
-                _("Catalog#"),
+                _("Labels"),
+                _("Catalog #s"),
                 _("Barcode"),
                 _("Language"),
                 _("Type"),