Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -N -r14943 -r14962
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14943)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14962)
@@ -155,3 +155,29 @@
 UPDATE ConfigurationValues
 SET DisplayOrder = DisplayOrder - 0.01
 WHERE VariableName IN ('l_EnableLinkContactForm', 'ReciprocalLinkChecking');
+
+UPDATE Phrase
+SET Module = 'In-Link'
+WHERE PhraseKey IN ('LA_LINK_CREATEDON', 'LA_LINK_DESCRIPTION', 'LA_LINK_HITS', 'LA_LINK_NAME', 'LA_LINK_URL');
+
+DELETE FROM Phrase
+WHERE PhraseKey IN (
+	'LA_LINK_URLSTATUS_PROMPT', 'LA_TEXT_LINK_SEARCH', 'LA_LINK_CATCHEDRATING',
+	'LA_LINK_CATCHEDREVIEWSQTY', 'LA_LINK_CATCHEDVOTESQTY'
+);
+
+DELETE FROM ConfigurationValues
+WHERE VariableName IN (
+	'Link_Highlight_OpenTag', 'Link_Highlight_CloseTag', 'Link_RatingToPop', 'Link_UrlStatus',
+	'Search_Link_CatchedRating', 'Search_Link_CatchedReviewsQty', 'Search_Link_CatchedVotesQty',
+	'Search_Link_CreatedOn', 'Search_Link_Description', 'Search_Link_EditorsPick', 'Search_Link_Hits',
+	'Search_Link_HotItem', 'Search_Link_LinkId', 'Search_Link_Name', 'Search_Link_NewItem', 'Search_Link_PopItem',
+	'Search_Link_Priority', 'Search_Link_ResourceId', 'Search_Link_ReviewById', 'Search_Link_Status', 'Search_Link_Url'
+);
+
+UPDATE ConfigurationValues
+SET DisplayOrder = DisplayOrder - 0.01
+WHERE VariableName IN (
+	'link_ReviewDelay_Value', 'link_ReviewDelay_Interval', 'link_RatingDelay_Value', 'link_RatingDelay_Interval',
+	'l_MaxCategories', 'l_EnableGoogleMaps', 'l_EnableLinkContactForm', 'ReciprocalLinkChecking'
+);
Index: branches/5.2.x/install/english.lang
===================================================================
diff -u -N -r14743 -r14962
--- branches/5.2.x/install/english.lang	(.../english.lang)	(revision 14743)
+++ branches/5.2.x/install/english.lang	(.../english.lang)	(revision 14962)
@@ -41,9 +41,13 @@
 			<PHRASE Label="la_IncreaseBy" Module="In-Link" Type="1">SW5jcmVhc2UgQnk=</PHRASE>
 			<PHRASE Label="la_ItemTab_Links" Module="In-Link" Type="1">TGlua3M=</PHRASE>
 			<PHRASE Label="la_link_AllowFreeListings" Module="In-Link" Type="1">QWxsb3cgRnJlZSBMaXN0aW5ncw==</PHRASE>
+			<PHRASE Label="la_Link_Description" Module="In-Link" Type="1">TGluayBEZXNjcmlwdGlvbg==</PHRASE>
 			<PHRASE Label="la_link_EnhancedLinks" Module="In-Link" Type="1">RW5oYW5jZWQgTGlzdGluZ3M=</PHRASE>
+			<PHRASE Label="la_Link_Hits" Module="In-Link" Type="1">SGl0cw==</PHRASE>
+			<PHRASE Label="la_Link_Name" Module="In-Link" Type="1">TGluayBOYW1l</PHRASE>
 			<PHRASE Label="la_link_sortreviews2_prompt" Module="In-Link" Type="1">YW5kIHRoZW4gYnk=</PHRASE>
 			<PHRASE Label="la_link_sortreviews_prompt" Module="In-Link" Type="1">U29ydCBDb21tZW50cyBieQ==</PHRASE>
+			<PHRASE Label="la_Link_URL" Module="In-Link" Type="1">VVJM</PHRASE>
 			<PHRASE Label="la_menu_Grouping" Module="In-Link" Type="1">R3JvdXBpbmcgQnk=</PHRASE>
 			<PHRASE Label="la_NotChecked" Module="In-Link" Type="1">Tm90IENoZWNrZWQ=</PHRASE>
 			<PHRASE Label="la_NotPendingRenewal" Module="In-Link" Type="1">Tm8=</PHRASE>
@@ -165,4 +169,4 @@
 			<EVENT MessageType="html" Event="LINK.VALIDATION.RESULTS" Type="1">U3ViamVjdDogTGluayBWYWxpZGF0aW9uIFJlc3VsdHMgKDxpbnAyOmxhbmcuY3VycmVudF9DdXJyZW50RGF0ZSBmb3JtYXQ9ImQtTS1ZIi8+KQoKTGluayBWYWxpZGF0aW9uIENvbXBsZXRlZCBvbiA8aW5wMjpsYW5nLmN1cnJlbnRfQ3VycmVudERhdGUgZm9ybWF0PSJkLU0tWSIvPiBhdCA8aW5wMjpsYW5nLmN1cnJlbnRfQ3VycmVudERhdGUgZm9ybWF0PSJIOmk6cyIvPjxiciAvPjxiciAvPg0KDQo8aW5wMjpsaW5rLXZhbGlkYXRpb24uaW52YWxpZF9Jbml0TGlzdCBwZXJfcGFnZT0iLTEiLz4NCjxpbnAyOm1faWYgY2hlY2s9ImxpbmstdmFsaWRhdGlvbi5pbnZhbGlkX1RvdGFsUmVjb3JkcyI+DQoJVGhlZXNlIGxpbmtzIHdlcmUgbWFya2VkIGFzIGludmFsaWQgZHVyaW5nIHZhbGlkYXRpb24gcHJvY2Vzczo8YnIgLz4NCg0KCTxpbnAyOm1fRGVmaW5lRWxlbWVudCBuYW1lPSJsaW5rX2VsZW1lbnQiPg0KCQk8bGk+DQoJCQk8aW5wMjpGaWVsZCBuYW1lPSJMaW5rTmFtZSIvPiAoPGlucDI6Q2F0ZWdvcnlOYW1lLz4pDQoJCTwvbGk+DQoJPC9pbnAyOm1fRGVmaW5lRWxlbWVudD4NCg0KCTx1bD4NCgkJPGlucDI6bGluay12YWxpZGF0aW9uLmludmFsaWRfUHJpbnRMaXN0IHJlbmRlcl9hcz0ibGlua19lbGVtZW50Ii8+DQoJPC91bD4NCjxpbnAyOm1fZWxzZS8+DQoJQWxsIGxpbmtzIGFwcGVhciB0byBiZSB2YWxpZC4NCjwvaW5wMjptX2lmPg==</EVENT>
 		</EVENTS>
 	</LANGUAGE>
-</LANGUAGES>
+</LANGUAGES>
\ No newline at end of file
Index: branches/5.2.x/install/install_data.sql
===================================================================
diff -u -N -r14943 -r14962
--- branches/5.2.x/install/install_data.sql	(.../install_data.sql)	(revision 14943)
+++ branches/5.2.x/install/install_data.sql	(.../install_data.sql)	(revision 14962)
@@ -1,7 +1,4 @@
 # Section "in-link:configuration_output":
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_Highlight_OpenTag', '<span class="match">', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_Highlight_CloseTag', '</span>', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_RatingToPop', '5', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortField', 'Name', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield_prompt', 'select', '', 'Name=la_Link_Name||Description=la_Link_Description||Url=la_Link_URL||CreatedOn=la_opt_CreatedOn||Hits=la_Link_Hits||CachedRating=la_opt_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 4) AND (IsSystem = 0)</SQL>', 10.01, 1, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortOrder', 'asc', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield_prompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.01, 2, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortField2', 'Description', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield2_prompt', 'select', '', 'Name=la_Link_Name||Description=la_Link_Description||Url=la_Link_URL||CreatedOn=la_opt_CreatedOn||Hits=la_Link_Hits||CachedRating=la_opt_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 4) AND (IsSystem = 0)</SQL>', 10.02, 1, 1, NULL);
@@ -15,15 +12,14 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_EnhancedLinks', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_EnhancedLinks', 'checkbox', '', '', 10.09, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_AllowFreeListings', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_AllowFreeListings', 'checkbox', '', '', 10.1, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ShowPick', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_editorspick_prompt', 'checkbox', '', '', 10.11, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_UrlStatus', '', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_urlstatus_prompt', 'checkbox', '', '', 10.12, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.13, 1, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.13, 2, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.14, 1, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.14, 2, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_MaxCategories', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.15, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableGoogleMaps', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_LinkEnableGoogleMaps', 'checkbox', NULL, NULL, 10.16, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableLinkContactForm', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_EnableLinkContactForm', 'checkbox', NULL, NULL, 10.17, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ReciprocalLinkChecking', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_ReciprocalLinkChecking', 'checkbox', NULL, NULL, 10.18, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.12, 1, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.12, 2, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.13, 1, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.13, 2, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_MaxCategories', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.14, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableGoogleMaps', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_LinkEnableGoogleMaps', 'checkbox', NULL, NULL, 10.15, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableLinkContactForm', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_EnableLinkContactForm', 'checkbox', NULL, NULL, 10.16, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ReciprocalLinkChecking', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_ReciprocalLinkChecking', 'checkbox', NULL, NULL, 10.17, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsSort', 'CreatedOn', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.01, 1, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsOrder', 'desc', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.01, 2, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsSort2', 'ReviewText', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.02, 1, 1, NULL);
@@ -39,28 +35,11 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_FullImageHeight', '450', 'In-Link', 'in-link:configuration_output', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 40.05, 0, 0, NULL);
 
 # Section "in-link:configuration_search":
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_LinkId', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_ReviewById', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Priority', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Status', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_EditorsPick', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_ResourceId', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_HotItem', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_PopItem', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_NewItem', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Keyword_links', '90', 'In-Link', 'in-link:configuration_search', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Pop_links', '5', 'In-Link', 'in-link:configuration_search', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Rating_links', '5', 'In-Link', 'in-link:configuration_search', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Increase_links', '30', 'In-Link', 'in-link:configuration_search', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_ShowMultiple_links', '0', 'In-Link', 'in-link:configuration_search', 'la_config_ShowMultiple', 'la_Text_MultipleShow', 'text', NULL, NULL, 0, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Description', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Description', 'checkbox', '', '', 1, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Name', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Name', 'checkbox', '', '', 2, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Url', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Url', 'checkbox', '', '', 5, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CreatedOn', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CreatedOn', 'checkbox', '', '', 5, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Hits', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Hits', 'checkbox', '', '', 6, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CatchedRating', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CatchedRating', 'checkbox', '', '', 7, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CatchedVotesQty', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CatchedVotesQty', 'checkbox', '', '', 8, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CatchedReviewsQty', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CatchedReviewsQty', 'checkbox', '', '', 9, 0, 1, NULL);
 
 INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'LINK.ADD', NULL, 1, 1, 'In-Link', 'Add Link', 1, 1, 1);
 INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'LINK.ADD', NULL, 1, 0, 'In-Link', 'Add Link', 0, 1, 1);