diff --git a/languages/en.ini b/languages/en.ini
index 372884dcad9872b64d1c913b7cdde74759954a8b..ea33519f0123bf3effe5d8ae44faef899bd3a2ed 100644
--- a/languages/en.ini
+++ b/languages/en.ini
@@ -340,6 +340,7 @@ Fine = Fine
 Fines = Fines
 fine_limit_patron = "You have reached your fines limit and cannot renew items"
 First = First
+First Edition = "First Edition"
 First Name = "First Name"
 fix_metadata = "Yes, fix the metadata; I'll wait"
 for search = "for search"
diff --git a/themes/bootstrap/js/advanced_search.js b/themes/bootstrap/js/advanced_search.js
index 226531b5c1900838adbbd8030610349b18339223..d23eee174c4ca4f1f7d363968b3a659368f0e59f 100644
--- a/themes/bootstrap/js/advanced_search.js
+++ b/themes/bootstrap/js/advanced_search.js
@@ -21,7 +21,7 @@ function addSearch(group, term, field)
     }
     newSearch += ">" + searchFields[key] + "</option>";
   }
-  newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete" title="Remove this term">&times;</a></div>';
+  newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete">&times;</a></div>';
 
   // Insert it
   $("#group" + group + "Holder").before(newSearch);
@@ -61,18 +61,18 @@ function addGroup(firstTerm, firstField, join)
   if(join == 'AND') {
     newGroup += ' selected';
   }
-  newGroup += '>ALL Terms</option>'
+  newGroup += '>' +searchJoins['AND'] + '</option>'
     + '<option value="OR"';
   if(join == 'OR') {
     newGroup += ' selected';
   }
-  newGroup += '>ANY Terms</option>'
+  newGroup += '>' +searchJoins['OR'] + '</option>'
     + '<option value="NOT"';
   if(join == 'NOT') {
     newGroup += ' selected';
   }
-  newGroup += '>NO Terms</option>'
-    + '</select><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="Remove Group">&times;</a></div><div class="span8 pull-left switch-margins row-fluid"><div class="span3 text-right"><span class="help-inline">'+searchLabel+':</span></div>'
+  newGroup += '>' +searchJoins['NOT'] + '</option>'
+    + '</select><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="'+deleteSearchGroupString+'">&times;</a></div><div class="span8 pull-left switch-margins row-fluid"><div class="span3 text-right"><span class="help-inline">'+searchLabel+':</span></div>'
     + '<div class="span9"><i id="group'+nextGroup+'Holder" class="icon-plus-sign"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div></div>';
 
   $('#groupPlaceHolder').before(newGroup);
diff --git a/themes/bootstrap/js/advanced_search_eds.js b/themes/bootstrap/js/advanced_search_eds.js
index df09591d796e5dedb1f93b807259c06948602673..2163b990217ece3e003f7dc5d216348bbb082558 100644
--- a/themes/bootstrap/js/advanced_search_eds.js
+++ b/themes/bootstrap/js/advanced_search_eds.js
@@ -40,7 +40,7 @@ function addSearch(group, term, field, op)
     }
     newSearch += ">" + searchFields[key] + "</option>";
   }
-  newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete" title="Remove this term">&times;</a></div>';
+  newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-inline delete">&times;</a></div>';
 
   // Insert it
   $("#group" + group + "Holder").before(newSearch);
@@ -77,7 +77,7 @@ function addGroup(firstTerm, firstField, join)
   var newGroup = '<div id="group'+nextGroup+'" class="group well clearfix">'
     + '<input type="hidden" name="bool'+nextGroup+'[]" value="AND"/>'
     + '<div class="span11"><div id="group'+nextGroup+'Holder" class="span9 offset3"><i class="icon-plus-sign"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div>'
-    + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="Remove Group">&times;</a></div></div>';
+    + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="'+deleteSearchGroupString+'">&times;</a></div></div>';
 
   $('#groupPlaceHolder').before(newGroup);
   addSearch(nextGroup, firstTerm, firstField);
diff --git a/themes/bootstrap/templates/search/advanced/globals.phtml b/themes/bootstrap/templates/search/advanced/globals.phtml
index 747aae95bea2b399a0ededffa974ad018a189e42..0a7a5e6d630610c4a7549c7ba59e81d556dd53c8 100644
--- a/themes/bootstrap/templates/search/advanced/globals.phtml
+++ b/themes/bootstrap/templates/search/advanced/globals.phtml
@@ -7,6 +7,7 @@ searchJoins["AND"]  = "<?=$this->transEsc("search_AND")?>";
 searchJoins["OR"]   = "<?=$this->transEsc("search_OR")?>";
 searchJoins["NOT"]  = "<?=$this->transEsc("search_NOT")?>";
 var addSearchString = "<?=$this->transEsc("add_search")?>";
+var addGroupString = "<?=$this->transEsc("add_search_group")?>";
 var searchLabel     = "<?=$this->transEsc("adv_search_label")?>";
 var searchFieldLabel = "<?=$this->transEsc("in")?>";
 var deleteSearchGroupString = "<?=$this->transEsc("del_search")?>";
diff --git a/themes/bootstrap/templates/search/advanced/layout.phtml b/themes/bootstrap/templates/search/advanced/layout.phtml
index 5214140c8e1081e16b0546a7a0b01e838b80d6c3..463d10ee4ae3e54a3199834f8d89b30560ca554d 100644
--- a/themes/bootstrap/templates/search/advanced/layout.phtml
+++ b/themes/bootstrap/templates/search/advanced/layout.phtml
@@ -49,13 +49,13 @@
       <div id="groupJoin" class="pull-right hidden">
         <label for="join"><?=$this->transEsc("search_match")?>:</label>
         <select id="search_bool0" name="join">
-          <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('ALL Groups') ?></option>
-          <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('ANY Groups') ?></option>
+          <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('group_AND') ?></option>
+          <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('group_OR') ?></option>
         </select>
       </div>
     </div>
     <div id="groupPlaceHolder" class="row-fluid">
-      <i class="icon-plus-sign"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('Add Group') ?></a>
+      <i class="icon-plus-sign"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('add_search_group') ?></a>
     </div>
     <input type="submit" value="<?= $this->transEsc('Find')?>" class="btn btn-primary pull-right"/>
     <? if (isset($this->extraAdvancedControls)): ?>
diff --git a/themes/bootstrap3/js/advanced_search.js b/themes/bootstrap3/js/advanced_search.js
index 9e2ad0480fac6531d6704f432517746aa8ee1c39..a39df9b9e9df1c149de762156db120bd673e750c 100644
--- a/themes/bootstrap3/js/advanced_search.js
+++ b/themes/bootstrap3/js/advanced_search.js
@@ -20,7 +20,7 @@ function addSearch(group, term, field)
     }
     newSearch += ">" + searchFields[key] + "</option>";
   }
-  newSearch += '</select></div><div class="col-md-1"><a class="help-block delete" href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="delete" title="Remove this term">&times;</a></div></div>';
+  newSearch += '</select></div><div class="col-md-1"><a class="help-block delete" href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="delete">&times;</a></div></div>';
 
   // Insert it
   $("#group" + group + "Holder").before(newSearch);
@@ -57,23 +57,23 @@ function addGroup(firstTerm, firstField, join)
     + '<div class="col-md-9"><i id="group'+nextGroup+'Holder" class="fa fa-plus-circle"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div></div>'
     + '<div class="col-md-3">'
     + '<label for="search_bool'+nextGroup+'">'+searchMatch+':&nbsp;</label>'
-    + '<a href="#" onClick="deleteGroup('+nextGroup+')" class="close hidden" title="Remove Group">&times;</a>'
+    + '<a href="#" onClick="deleteGroup('+nextGroup+')" class="close hidden" title="'+deleteSearchGroupString+'">&times;</a>'
     + '<select id="search_bool'+nextGroup+'" name="bool'+nextGroup+'[]" class="form-control">'
     + '<option value="AND"';
   if(join == 'AND') {
     newGroup += ' selected';
   }
-  newGroup += '>ALL Terms</option>'
+  newGroup += '>' +searchJoins['AND'] + '</option>'
     + '<option value="OR"';
   if(join == 'OR') {
     newGroup += ' selected';
   }
-  newGroup += '>ANY Terms</option>'
+  newGroup += '>' +searchJoins['OR'] + '</option>'
     + '<option value="NOT"';
   if(join == 'NOT') {
     newGroup += ' selected';
   }
-  newGroup += '>NO Terms</option>'
+  newGroup += '>' +searchJoins['NOT'] + '</option>'
     + '</select></div></div>';
 
   $('#groupPlaceHolder').before(newGroup);
diff --git a/themes/bootstrap3/js/advanced_search_eds.js b/themes/bootstrap3/js/advanced_search_eds.js
index ad661f831b3234bf49006feb0a86e8ff595e65f8..0dcf7ec2ef98ada9b7147b4c059dd8ef65778782 100644
--- a/themes/bootstrap3/js/advanced_search_eds.js
+++ b/themes/bootstrap3/js/advanced_search_eds.js
@@ -40,7 +40,7 @@ function addSearch(group, term, field, op)
     }
     newSearch += ">" + searchFields[key] + "</option>";
   }
-  newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-block delete" title="Remove this term">&times;</a></div>';
+  newSearch += '</select> <a href="#" onClick="deleteSearch('+group+','+inputIndex+')" class="help-block delete">&times;</a></div>';
 
   // Insert it
   $("#group" + group + "Holder").before(newSearch);
@@ -77,7 +77,7 @@ function addGroup(firstTerm, firstField, join)
   var newGroup = '<div id="group'+nextGroup+'" class="group well clearfix">'
     + '<input type="hidden" name="bool'+nextGroup+'[]" value="AND"/>'
     + '<div class="span11"><div id="group'+nextGroup+'Holder" class="span9 offset3"><i class="icon-plus-sign"></i> <a href="#" onClick="addSearch('+nextGroup+')">'+addSearchString+'</a></div></div>'
-    + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="Remove Group">&times;</a></div></div>';
+    + '<div class="span1"><a href="#" onClick="deleteGroup('+nextGroup+')" class="close hide" title="'+deleteSearchGroupString+'">&times;</a></div></div>';
 
   $('#groupPlaceHolder').before(newGroup);
   addSearch(nextGroup, firstTerm, firstField);
diff --git a/themes/bootstrap3/templates/search/advanced/globals.phtml b/themes/bootstrap3/templates/search/advanced/globals.phtml
index 747aae95bea2b399a0ededffa974ad018a189e42..0a7a5e6d630610c4a7549c7ba59e81d556dd53c8 100644
--- a/themes/bootstrap3/templates/search/advanced/globals.phtml
+++ b/themes/bootstrap3/templates/search/advanced/globals.phtml
@@ -7,6 +7,7 @@ searchJoins["AND"]  = "<?=$this->transEsc("search_AND")?>";
 searchJoins["OR"]   = "<?=$this->transEsc("search_OR")?>";
 searchJoins["NOT"]  = "<?=$this->transEsc("search_NOT")?>";
 var addSearchString = "<?=$this->transEsc("add_search")?>";
+var addGroupString = "<?=$this->transEsc("add_search_group")?>";
 var searchLabel     = "<?=$this->transEsc("adv_search_label")?>";
 var searchFieldLabel = "<?=$this->transEsc("in")?>";
 var deleteSearchGroupString = "<?=$this->transEsc("del_search")?>";
diff --git a/themes/bootstrap3/templates/search/advanced/layout.phtml b/themes/bootstrap3/templates/search/advanced/layout.phtml
index 19374801090c8ce89c71cbe63f618403b366f742..9fd307760a7f93be0c72115d6ada21e108968335 100644
--- a/themes/bootstrap3/templates/search/advanced/layout.phtml
+++ b/themes/bootstrap3/templates/search/advanced/layout.phtml
@@ -49,12 +49,12 @@
       <div id="groupJoin" class="form-inline pull-right hidden">
         <label for="join"><?=$this->transEsc("search_match")?>:</label>
         <select id="search_bool0" name="join" class="form-control">
-          <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('ALL Groups') ?></option>
-          <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('ANY Groups') ?></option>
+          <option value="AND"<? if($searchDetails && $searchDetails->getOperator()=='ALL'):?> selected<?endif?>><?= $this->transEsc('group_AND') ?></option>
+          <option value="OR"<? if($searchDetails && $searchDetails->getOperator()=='OR'):?> selected<?endif?>><?= $this->transEsc('group_OR') ?></option>
         </select>
       </div>
     </div>
-    <i id="groupPlaceHolder" class="fa fa-plus-circle"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('Add Group') ?></a>
+    <i id="groupPlaceHolder" class="fa fa-plus-circle"></i> <a href="#" onClick="addGroup()"><?= $this->transEsc('add_search_group') ?></a>
     <input class="btn btn-primary pull-right" type="submit" value="<?= $this->transEsc('Find')?>">
     <? if (isset($this->extraAdvancedControls)): ?>
       <?=$this->extraAdvancedControls ?>