diff --git a/e107_admin/search.php b/e107_admin/search.php
index 5f61191a8..73076516a 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -36,7 +36,7 @@ $query = explode('.', e_QUERY);
 $search_prefs = $sysprefs -> getArray('search_prefs');
 
 $search_handlers['news'] = ADLAN_0;
-$search_handlers['comments'] = SEALAN_6;
+$search_handlers['comments'] = ADLAN_114;
 $search_handlers['users'] = SEALAN_7;
 $search_handlers['downloads'] = ADLAN_24;
 $search_handlers['pages'] = SEALAN_39;
@@ -258,16 +258,16 @@ if ($query[0] == 'settings')
 					<tr>
 						<td>".SEALAN_3."</td>
 						<td>
-							".$frm->radio_switch('search_sort', $search_prefs['mysql_sort'], 'MySql', SEALAN_31)."&nbsp;
+							".$frm->radio_switch('search_sort', $search_prefs['mysql_sort'], 'MySQL', SEALAN_31)."&nbsp;
 							".$frm->text('php_limit', $tp -> toForm($search_prefs['php_limit']), 5, 'class=tbox&size=5')."&nbsp;".SEALAN_32."
-							<div class='field-help'>".SEALAN_49."</div>
+							<span class='field-help'>".SEALAN_49."</span>
 						</td>
 					</tr>
 					<tr>
 						<td>".SEALAN_47."</td>
 						<td>
 							".$frm->radio_switch('boundary', $search_prefs['boundary'])."
-							<div class='field-help'>".SEALAN_48."</div>
+							<span class='field-help'>".SEALAN_48."</span>
 						</td>
 					</tr>
 				</tbody>
@@ -333,9 +333,9 @@ elseif ($query[0] == 'edit')
 					<tr>
 						<td>".SEALAN_26.":</td>
 						<td>
-							<input type='radio' class='radio' id='pre-title-1' name='pre_title' value='1'".(($search_prefs[$handler_type][$query[2]]['pre_title'] == 1) ? " checked='checked'" : "")." /><label for='pre-title-1'>".SEALAN_22."</label><br />
-							<input type='radio' class='radio' id='pre-title-0' name='pre_title' value='0'".(($search_prefs[$handler_type][$query[2]]['pre_title'] == 0) ? " checked='checked'" : "")." /><label for='pre-title-0'>".SEALAN_17."</label><br />
-							<input type='radio' class='radio' id='pre-title-2' name='pre_title' value='2'".(($search_prefs[$handler_type][$query[2]]['pre_title'] == 2) ? " checked='checked'" : "")." /><label for='pre-title-2'>".SEALAN_23."</label>
+							<input type='radio' class='radio' id='pre-title-1' name='pre_title' value='1'".(($search_prefs[$handler_type][$query[2]]['pre_title'] == 1) ? " checked='checked'" : "")." /><label for='pre-title-1'>". ADLAN_133."</label><br />
+							<input type='radio' class='radio' id='pre-title-0' name='pre_title' value='0'".(($search_prefs[$handler_type][$query[2]]['pre_title'] == 0) ? " checked='checked'" : "")." /><label for='pre-title-0'>".LAN_DISABLED."</label><br />
+							<input type='radio' class='radio' id='pre-title-2' name='pre_title' value='2'".(($search_prefs[$handler_type][$query[2]]['pre_title'] == 2) ? " checked='checked'" : "")." /><label for='pre-title-2'>".SEALAN_23.":</label>
 							<div>
 								<input class='tbox input-text' type='text' name='pre_title_alt' value='".$tp -> toForm($search_prefs[$handler_type][$query[2]]['pre_title_alt'])."' size='20' />
 							</div>
@@ -502,7 +502,7 @@ function search_adminmenu()
 	$var['main']['text'] = SEALAN_41;
 	$var['main']['link'] = e_SELF;
 
-	$var['settings']['text'] = SEALAN_42;
+	$var['settings']['text'] = ADLAN_4;
 	$var['settings']['link'] = e_SELF."?settings";
 
 	e107::getNav()->admin(SEALAN_40, $action, $var);
diff --git a/e107_languages/English/admin/lan_search.php b/e107_languages/English/admin/lan_search.php
index 6ff7a5999..860978669 100644
--- a/e107_languages/English/admin/lan_search.php
+++ b/e107_languages/English/admin/lan_search.php
@@ -1,18 +1,14 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system - Language File.
-|
-|     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_search.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
+ * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * $Id$
+ *
+ * Admin Language File - Search
 */
 define("SEALAN_1", "Search Configuration");
-define("SEALAN_2", "Number of characters displayed in search result summary:");
+//define("SEALAN_2", "Number of characters displayed in search result summary:");
 define("SEALAN_3", "Search sort method:");
-define("SEALAN_6", "Comments");
+//define("SEALAN_6", "Comments");
 define("SEALAN_7", "Registered Members");
 define("SEALAN_10", "Display relevance value:");
 define("SEALAN_11", "Allow user to select searchable areas:");
@@ -20,16 +16,16 @@ define("SEALAN_12", "Restrict time allowed between searches (max 5 mins):");
 define("SEALAN_13", "Restrict to one search every");
 define("SEALAN_14", "seconds");
 define("SEALAN_15", "Search page accessible to user class");
-define("SEALAN_16", "On");
-define("SEALAN_17", "Off");
+//define("SEALAN_16", "On");
+//define("SEALAN_17", "Off");
 define("SEALAN_18", "Searchable Comments Areas (when comments search is activated)");
 define("SEALAN_19", "Allow users to search more than one area at a time:");
 define("SEALAN_20", "General Settings");
 define("SEALAN_21", "Searchable Areas");
-define("SEALAN_22", "Default");
-define("SEALAN_23", "Alternative:");
-define("SEALAN_24", "Type");
-define("SEALAN_25", "User Class");
+//define("SEALAN_22", "Default");
+define("SEALAN_23", "Alternative");
+//define("SEALAN_24", "Type");
+define("SEALAN_25", "Userclass");
 define("SEALAN_26", "Pre-Title Text");
 define("SEALAN_30", "Highlight keywords on referred to page:");
 define("SEALAN_31", "PHP limited to");
@@ -42,13 +38,13 @@ define("SEALAN_37", "Checkbox");
 define("SEALAN_38", "Radio");
 define("SEALAN_39", "Custom Pages");
 
-define("LAN_SEARCH_98", "News");		// Renamed to avoid clashes
-define("LAN_197", "Downloads");
-define("LAN_418", "Custom Pages");
+//define("LAN_SEARCH_98", "News");		// Renamed to avoid clashes
+//define("LAN_197", "Downloads");
+//define("LAN_418", "Custom Pages");
 
 define("SEALAN_40", "Search Options");
 define("SEALAN_41", "Main Page");
-define("SEALAN_42", "Preferences");
+//define("SEALAN_42", "Preferences");
 
 define("SEALAN_43", "Edit search settings for");
 define("SEALAN_44", "User class allowed to search this area");