diff --git a/src/calibre/gui2/preferences/search.ui b/src/calibre/gui2/preferences/search.ui
index 7e41b9e40f..8e8ea35199 100644
--- a/src/calibre/gui2/preferences/search.ui
+++ b/src/calibre/gui2/preferences/search.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>670</width>
-    <height>556</height>
+    <height>663</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,26 +21,21 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="0" column="1">
+    <widget class="QCheckBox" name="opt_use_primary_find_in_search">
+     <property name="text">
+      <string>Unaccented characters match accented characters</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="opt_highlight_search_matches">
      <property name="text">
       <string>&amp;Highlight search results instead of restricting the book list to the results</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="opt_use_primary_find_in_search">
-     <property name="text">
-      <string>Base characters match accented characters</string>
-     </property>
-     <property name="toolTip">
-      <string>Characters typed in the search box will match their
-accented versions, using language rules. For example, in
-English, searching for e will match &#233; and &#232;.</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="4" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>What to search by default</string>
@@ -89,17 +84,7 @@ English, searching for e will match &#233; and &#232;.</string>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QPushButton" name="clear_history_button">
-     <property name="toolTip">
-      <string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
-     </property>
-     <property name="text">
-      <string>Clear search &amp;histories</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
+   <item row="6" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Grouped Search Terms</string>
@@ -119,12 +104,6 @@ English, searching for e will match &#233; and &#232;.</string>
         </item>
         <item>
          <widget class="QComboBox" name="gst_names">
-          <property name="editable">
-           <bool>true</bool>
-          </property>
-          <property name="minimumContentsLength">
-           <number>10</number>
-          </property>
           <property name="toolTip">
            <string>Contains the names of the currently-defined group search terms.
 Create a new name by entering it into the empty box, then
@@ -132,6 +111,12 @@ pressing Save. Rename a search term by selecting it then
 changing the name and pressing Save. Change the value of
 a search term by changing the value box then pressing Save.</string>
           </property>
+          <property name="editable">
+           <bool>true</bool>
+          </property>
+          <property name="minimumContentsLength">
+           <number>10</number>
+          </property>
          </widget>
         </item>
         <item>
@@ -213,7 +198,17 @@ to be shown as user categories</string>
      </layout>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="5" column="0" colspan="2">
+    <widget class="QPushButton" name="clear_history_button">
+     <property name="toolTip">
+      <string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
+     </property>
+     <property name="text">
+      <string>Clear search &amp;histories</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox22">
      <property name="title">
       <string>What to search when searching similar books</string>
@@ -223,7 +218,7 @@ to be shown as user categories</string>
        <widget class="QLabel" name="label">
         <property name="text">
          <string>&lt;p&gt;When you search for similar books by right clicking the
-         book and selecting "Similar books...",
+         book and selecting &quot;Similar books...&quot;,
          calibre constructs a search using the column lookup names specified below.
          By changing the lookup name to a grouped search term you can
          search multiple columns at once.&lt;/p&gt;</string>
@@ -251,8 +246,7 @@ to be shown as user categories</string>
        </widget>
       </item>
       <item row="1" column="2">
-       <widget class="QComboBox" name="opt_similar_authors_match_kind">
-       </widget>
+       <widget class="QComboBox" name="opt_similar_authors_match_kind"/>
       </item>
       <item row="1" column="3">
        <widget class="QLabel" name="label_222">
@@ -272,8 +266,7 @@ to be shown as user categories</string>
        </widget>
       </item>
       <item row="1" column="5">
-       <widget class="QComboBox" name="opt_similar_series_match_kind">
-       </widget>
+       <widget class="QComboBox" name="opt_similar_series_match_kind"/>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_223">
@@ -283,12 +276,10 @@ to be shown as user categories</string>
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="similar_tags_search_key">
-       </widget>
+       <widget class="QComboBox" name="similar_tags_search_key"/>
       </item>
       <item row="2" column="2">
-       <widget class="QComboBox" name="opt_similar_tags_match_kind">
-       </widget>
+       <widget class="QComboBox" name="opt_similar_tags_match_kind"/>
       </item>
       <item row="2" column="3">
        <widget class="QLabel" name="label_224">
@@ -298,12 +289,10 @@ to be shown as user categories</string>
        </widget>
       </item>
       <item row="2" column="4">
-       <widget class="QComboBox" name="similar_publisher_search_key">
-       </widget>
+       <widget class="QComboBox" name="similar_publisher_search_key"/>
       </item>
       <item row="2" column="5">
-       <widget class="QComboBox" name="opt_similar_publisher_match_kind">
-       </widget>
+       <widget class="QComboBox" name="opt_similar_publisher_match_kind"/>
       </item>
      </layout>
     </widget>
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index aa286f4735..d18a10dbfd 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -118,7 +118,9 @@ class MetadataBackup(Thread): # {{{
 
 # }}}
 
+
 ### Global utility function for get_match here and in gui2/library.py
+# This is a global for performance
 pref_use_primary_find_in_search = False
 
 def set_use_primary_find_in_search(toWhat):
diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index 7a4e15753e..a50d0fd153 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -424,8 +424,10 @@ def _prefs():
                 'to limit search columns above.'))
     c.add_opt('use_primary_find_in_search', default=True,
             help=_('Characters typed in the search box will match their '
-                   'accented versions, using language rules. For example, in '
-                   ' English, searching for e will match é and è.'))
+                   'accented versions, based on the language you have chosen '
+                   'for the calibre interface. For example, in '
+                   u' English, searching for n will match ñ and n, but if '
+                   'your language is Spanish it will only match n.'))
 
     c.add_opt('migrated', default=False, help='For Internal use. Don\'t modify.')
     return c