Index: in-auction/install/install_data.sql
===================================================================
--- in-auction/install/install_data.sql	(revision 13329)
+++ in-auction/install/install_data.sql	(working copy)
@@ -1,6 +1,6 @@
 # Section "ebay:configuration_feedbacks":
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_EnableFeedback', '0', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_General', 'la_title_eBay_EnableAutomaticFeedback', 'checkbox', '', '', 1, 0, 0);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_FeedbackEvent', '3', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_General', 'la_config_eBay_FeedbackEvent', 'select', '', '1=la_PaymentReceived,2=la_ItemShipped,3=la_PaymentReceivedOrItemShipped,4=la_WhenBuyerLeavesFeedback', 2, 0, 0);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_FeedbackEvent', '3', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_General', 'la_config_eBay_FeedbackEvent', 'select', '', '1=la_PaymentReceived||2=la_ItemShipped||3=la_PaymentReceivedOrItemShipped||4=la_WhenBuyerLeavesFeedback', 2, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_EnableFeedbackRotation', '1', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_General', 'la_config_eBay_EnableFeedbackRotation', 'checkbox', '', '', 3, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_FeedbackMessage1', '', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_General', 'la_config_eBay_FeedbackMessage1', 'textarea', '', 'COLS=40 ROWS=5', 4, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_FeedbackMessage2', '', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_General', 'la_config_eBay_FeedbackMessage2', 'textarea', '', 'COLS=40 ROWS=5', 5, 0, 0);
@@ -14,7 +14,7 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_FeedbackNotificationCCtoSeller', '1', 'In-Auction', 'ebay:configuration_feedbacks', 'la_title_Notifications', 'la_config_eBay_FeedbackNotificationCCtoSeller', 'checkbox', '', '', 13, 0, 0);
 
 # Section "eBay:configuration_general":
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_ConnectionMode', '2', 'In-Auction', 'eBay:configuration_general', 'la_title_General', 'la_config_eBay_ConnectionMode', 'radio', '', '1=la_opt_Production,2=la_opt_Sandbox', 10.01, 0, 0);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_ConnectionMode', '2', 'In-Auction', 'eBay:configuration_general', 'la_title_General', 'la_config_eBay_ConnectionMode', 'radio', '', '1=la_opt_Production||2=la_opt_Sandbox', 10.01, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_CompatibilityLevel', '549', 'In-Auction', 'eBay:configuration_general', 'la_title_General', 'la_config_eBay_CompatibilityLevel', 'text', '', '', 10.02, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_Production_NewAuthToken', NULL, 'In-Auction', 'eBay:configuration_general', 'la_title_ProductionSettings', 'la_config_eBay_NewAuthToken', 'textarea', '', 'COLS=40 ROWS=5', 20.01, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_Production_SOAPGateway', 'https://api.ebay.com/wsapi', 'In-Auction', 'eBay:configuration_general', 'la_title_ProductionSettings', 'la_config_eBay_SOAPGateway', 'text', '', 'size="40"', 20.05, 0, 0);
@@ -52,7 +52,7 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_ReturnRequestDays', '32031', 'In-Auction', 'eBay:listings_defaults', 'la_title_General', 'la_title_ReturnRequestDays', 'select', '', '<SQL+>SELECT FieldOptionKey AS OptionValue , FieldOptionTitle AS OptionName FROM <PREFIX>eBayFieldOptions WHERE FieldName="ReturnRequestDays"</SQL>', 30.243, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_ReturnPolicyDetails', 'No Excuses', 'In-Auction', 'eBay:listings_defaults', 'la_title_General', 'la_title_ReturnPolicyDetails', 'textarea', '', 'COLS=40 ROWS=5', 30.25, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_PaymentInstructions', 'Payment Instructions', 'In-Auction', 'eBay:listings_defaults', 'la_title_General', 'la_title_PaymentInstructions', 'textarea', '', 'COLS=40 ROWS=5', 30.27, 0, 0);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_InsuranceType', '1', 'In-Auction', 'eBay:listings_defaults', 'la_title_Insurance', 'la_title_InsuranceType', 'select', '', '1=+Percent,2=+Flat', 55, 0, 0);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_InsuranceType', '1', 'In-Auction', 'eBay:listings_defaults', 'la_title_Insurance', 'la_title_InsuranceType', 'select', '', '1=+Percent||2=+Flat', 55, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_InsuranceAmount', '5', 'In-Auction', 'eBay:listings_defaults', 'la_title_Insurance', 'la_title_InsuranceAmount', 'text', '', 'size="5"', 56, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_UseInsurance', 'IncludedInShippingHandling', 'In-Auction', 'eBay:listings_defaults', 'la_title_Insurance', 'la_title_UseInsurance', 'select', '', '<SQL+>SELECT FieldOptionKey AS OptionValue , FieldOptionTitle AS OptionName FROM <PREFIX>eBayFieldOptions WHERE FieldName="InsuranceOption"</SQL>', 57, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'eBay_GetItFast', '0', 'In-Auction', 'eBay:listings_defaults', 'la_title_General', 'la_title_GetItFast', 'checkbox', '', '', 60, 0, 0);
Index: in-auction/units/listing/listing_eh.php
===================================================================
--- in-auction/units/listing/listing_eh.php	(revision 13329)
+++ in-auction/units/listing/listing_eh.php	(working copy)
@@ -507,12 +507,12 @@
 					$location = trim($location, ',');
 
 					$country = $this->Application->ConfigValue('Comm_Shipping_Country');  // as USA
+
+					$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+					/* @var $cs_helper kCountryStatesHelper */
+
 					// Convert to 2-symbol - as US
-					$sql = 'SELECT DestAbbr2
-						FROM '.TABLE_PREFIX.'StdDestinations
-						WHERE DestAbbr = '.$this->Conn->qstr($country).'
-					';
-					$country = $this->Conn->GetOne($sql);
+					$country = $cs_helper->getCountryIso($country);
 
 					$a_item = Array(
 						'Currency'=> 'USD',
Index: in-auction/units/sections/ebay_eh.php
===================================================================
--- in-auction/units/sections/ebay_eh.php	(revision 13329)
+++ in-auction/units/sections/ebay_eh.php	(working copy)
@@ -1942,13 +1942,12 @@
 
 			$ShippingAddress =& $Transaction->Buyer->BuyerInfo->ShippingAddress;
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
 			// Country transform to 3-symbol code
-			$sql = 'SELECT DestAbbr
-				FROM '.TABLE_PREFIX.'StdDestinations
-				WHERE  DestAbbr2 = '.$this->Conn->qstr($ShippingAddress->Country);
-			$country = $this->Conn->GetOne($sql);
+			$country = $cs_helper->getCountryIso($ShippingAddress->Country, true);
 
-
 			$Order->SetDBField('BillingTo', $ShippingAddress->Name);
 			$Order->SetDBField('BillingPhone', $ShippingAddress->Phone);
 			$Order->SetDBField('BillingEmail', $User->GetDBField('Email'));
Index: in-bulletin/install/install_data.sql
===================================================================
--- in-bulletin/install/install_data.sql	(revision 13329)
+++ in-bulletin/install/install_data.sql	(working copy)
@@ -1,10 +1,10 @@
 # Section "in-bulletin:configuration_output":
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_Highlight_OpenTag', '<span class="match">', 'In-Bulletin', 'in-bulletin:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_Highlight_CloseTag', '</span>', 'In-Bulletin', 'in-bulletin:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 10.01, 2, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortField', 'LastPostDate', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'TopicText=la_opt_TopicText,Posts=la_opt_NumberOfPosts,CreatedOn=la_opt_CreatedOn,LastPostDate=la_opt_LastUpdated,Views=la_opt_TopicViews,CachedRating=la_opt_Rating,LastPoser=la_opt_LastPoster,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 3) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder2', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield2_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 10.02, 2, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortField2', 'Posts', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield2_prompt', 'select', '', 'TopicText=la_opt_TopicText,Posts=la_opt_NumberOfPosts,CreatedOn=la_opt_CreatedOn,LastPostDate=la_opt_LastUpdated,Views=la_opt_TopicViews,CachedRating=la_opt_Rating,LastPoser=la_opt_LastPoster,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 3) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 10.01, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortField', 'LastPostDate', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'TopicText=la_opt_TopicText||Posts=la_opt_NumberOfPosts||CreatedOn=la_opt_CreatedOn||LastPostDate=la_opt_LastUpdated||Views=la_opt_TopicViews||CachedRating=la_opt_Rating||LastPoser=la_opt_LastPoster||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 3) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder2', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield2_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 10.02, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortField2', 'Posts', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield2_prompt', 'select', '', 'TopicText=la_opt_TopicText||Posts=la_opt_NumberOfPosts||CreatedOn=la_opt_CreatedOn||LastPostDate=la_opt_LastUpdated||Views=la_opt_TopicViews||CachedRating=la_opt_Rating||LastPoser=la_opt_LastPoster||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 3) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Topics', '5', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_perpage_prompt', 'text', '', '', 10.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Topics_Short', '3', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_perpage_short_prompt', 'text', '', '', 10.04, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_NewDays', '6', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_newdays_prompt', 'text', '', '', 10.05, 0, 1);
@@ -12,9 +12,9 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_MinPopVotes', '8', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_fld_Topic_MinPopVotes', 'text', '', '', 10.07, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_MaxHotNumber', '3', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_fld_Topic_MaxHotNumber', 'text', '', '', 10.08, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_EditorPicksAbove', '1', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_editorpicksabove_prompt', 'checkbox', '', '', 10.09, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_ReviewDelay_Interval', '60', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', '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.1, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_ReviewDelay_Interval', '60', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', '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.1, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_ReviewDelay_Value', '10', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.1, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_RatingDelay_Interval', '3600', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', '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.11, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_RatingDelay_Interval', '3600', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', '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.11, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_RatingDelay_Value', '1', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.11, 1, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AutoTopicLockPosts', '0', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_PostsToLock', 'text', NULL, NULL, 10.12, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Postings', '25', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_posts_subheading', 'la_posts_perpage_prompt', 'text', '', '', 20.01, 0, 1);
@@ -28,7 +28,7 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_FullImageWidth', '450', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 50.04, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_FullImageHeight', '450', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 50.05, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'poll_CommentDelay_Value', '10', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Polls', 'la_prompt_DupPollComments', 'text', '', 'style="width: 50px;"', 60.1, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'poll_CommentDelay_Interval', '60', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Polls', 'la_prompt_DupPollComments', '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', 60.2, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'poll_CommentDelay_Interval', '60', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Polls', 'la_prompt_DupPollComments', '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', 60.2, 2, 1);
 
 # Section "in-bulletin:configuration_search":
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Increase_topics', '30', 'In-Bulletin', 'in-bulletin:configuration_search', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1);
Index: in-commerce/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
--- in-commerce/admin_templates/discounts/gift_certificate_edit.tpl	(revision 13329)
+++ in-commerce/admin_templates/discounts/gift_certificate_edit.tpl	(working copy)
@@ -140,7 +140,7 @@
 				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientCity" title="la_fld_City"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientZipcode" title="la_fld_Zip"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientState" title="la_fld_State"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="gc" field="RecipientCountry" title="la_fld_Country"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="gc" field="RecipientCountry" title="la_fld_Country" has_empty="1"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientPhone" title="la_fld_Phone"/>
 			</inp2:m_if>
 
Index: in-commerce/admin_templates/shipping/zone_edit.tpl
===================================================================
--- in-commerce/admin_templates/shipping/zone_edit.tpl	(revision 13329)
+++ in-commerce/admin_templates/shipping/zone_edit.tpl	(working copy)
@@ -56,7 +56,7 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="destination_block">
+<inp2:m_DefineElement name="destination_block" selected="">
 	<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="destination_title"/></option>
 </inp2:m_DefineElement>
 
@@ -160,6 +160,9 @@
 <inp2:z_SaveWarning name="grid_save_warning"/>
 <inp2:z_ErrorWarning name="form_error_warning"/>
 
+<!--## used for OnCountryChange event ##-->
+<input type="hidden" name="z_id" value="<inp2:z_Field name='ZoneID'/>"/>
+
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_ShippingZone!"/>
@@ -171,17 +174,15 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="z" field="CODallowed" title="!la_fld_CODallowed!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="z" field="Type" title="!la_fld_Zone_Type!"/>
 
-			<!-- <inp2:z_ShowDestinations block="destination_block" /> -->
-
-			<inp2:m_if check="z_fieldequals" field="Type" value="1"  >
+			<inp2:m_if check="z_Field" field="Type" equals_to="1" db="db">
 				<inp2:m_RenderElement name="countries_multiple" prefix="z" />
 			</inp2:m_if>
 
-			<inp2:m_if check="z_fieldequals" field="Type" value="2"  >
+			<inp2:m_if check="z_Field" field="Type" equals_to="2" db="db">
 				<inp2:m_RenderElement name="states_multiple" prefix="z" />
 			</inp2:m_if>
 
-			<inp2:m_if check="z_fieldequals" field="Type" value="3"  >
+			<inp2:m_if check="z_Field" field="Type" equals_to="3" db="db">
 				<inp2:m_RenderElement name="zips_multiple" prefix="z" />
 			</inp2:m_if>
 
@@ -193,8 +194,7 @@
 <input type="hidden" value="" name="selected_destinations" id="selected_destinations">
 <input type="hidden" name="z_OriginalSaveEvent" id="z_OriginalSaveEvent" value="<inp2:z_SaveEvent/>">
 
-<input type="hidden" name="z[<inp2:z_field field="ZoneID"/>][ShippingTypeID]" id="z[<inp2:z_field field="ZoneID"/>][ShippingTypeID]" value="<inp2:z_field field="ShippingTypeID"/>">
-<input type="hidden" name="z_id" id="z_id" value="<inp2:z_Field field="ZoneID"/>">
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="z" field="ShippingTypeID"/>
 
 <script>
 	document.getElementById('z[<inp2:z_field field="ZoneID"/>][Type]_1').onchange = change_type;
Index: in-commerce/admin_templates/taxes/taxes_edit.tpl
===================================================================
--- in-commerce/admin_templates/taxes/taxes_edit.tpl	(revision 13329)
+++ in-commerce/admin_templates/taxes/taxes_edit.tpl	(working copy)
@@ -54,7 +54,7 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="destination_block">
+<inp2:m_DefineElement name="destination_block" selected="">
 	<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="destination_title"/></option>
 </inp2:m_DefineElement>
 
@@ -173,17 +173,15 @@
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToProcessing" title="!la_fld_TaxApplyToProcessing!"/>
 		<inp2:m_RenderElement name="inp_edit_radio" prefix="tax" field="Type" title="!la_fld_ZoneType!"/>
 
-		<!-- <inp2:tax_ShowDestinations block="destination_block" /> -->
-
-		<inp2:m_if check="tax_fieldequals" field="Type" value="1"  >
+		<inp2:m_if check="tax_Field" field="Type" equals_to="1" db="db">
 			<inp2:m_RenderElement name="countries_multiple" prefix="tax" />
 		</inp2:m_if>
 
-		<inp2:m_if check="tax_fieldequals" field="Type" value="2"  >
+		<inp2:m_if check="tax_Field" field="Type" equals_to="2" db="db">
 			<inp2:m_RenderElement name="states_multiple" prefix="tax" />
 		</inp2:m_if>
 
-		<inp2:m_if check="tax_fieldequals" field="Type" value="3"  >
+		<inp2:m_if check="tax_Field" field="Type" equals_to="3" db="db">
 			<inp2:m_RenderElement name="zips_multiple" prefix="tax" />
 		</inp2:m_if>
 
Index: in-commerce/install/install_data.sql
===================================================================
--- in-commerce/install/install_data.sql	(revision 13329)
+++ in-commerce/install/install_data.sql	(working copy)
@@ -10,13 +10,13 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AddressLine2', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_AddressLine2', 'text', NULL, NULL, 20.02, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_City', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_City', 'text', NULL, NULL, 20.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_ZIP', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_ZIP', 'text', NULL, NULL, 20.04, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Country', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_Country', 'select', NULL, '0=lu_none,<SQL>SELECT DestName AS OptionName, DestAbbr AS OptionValue FROM <PREFIX>StdDestinations WHERE DestParentId IS NULL Order BY OptionName</SQL>', 20.05, 0, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Country', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_Country', 'select', NULL, '0=lu_none||<SQL+>SELECT l%3$s_Name AS OptionName, CountryStateId AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>', 20.05, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_State', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_State', 'text', NULL, '', 20.06, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_AddressLine1', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_AddressLine1', 'text', NULL, NULL, 30.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_AddressLine2', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_AddressLine2', 'text', NULL, NULL, 30.02, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_City', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_City', 'text', NULL, NULL, 30.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_ZIP', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_ZIP', 'text', NULL, NULL, 30.04, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_Country', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_Country', 'select', NULL, '0=lu_none,<SQL>SELECT DestName AS OptionName, DestAbbr AS OptionValue FROM <PREFIX>StdDestinations WHERE DestParentId IS NULL Order BY OptionName</SQL>', 30.05, 0, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_Country', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_Country', 'select', NULL, '0=lu_none||<SQL+>SELECT l%3$s_Name AS OptionName, CountryStateId AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>', 30.05, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Shipping_State', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_State', 'text', NULL, NULL, 30.06, 0, 1);
 
 # Section "in-commerce:general":
@@ -32,18 +32,18 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxAddresses', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaxAddresses', 'text', NULL, NULL, 10.1, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_MaskProcessedCreditCards', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaskProcessedCreditCards', 'checkbox', NULL, NULL, 10.11, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AllowOrderingInNonPrimaryCurrency', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_AllowOrderingInNonPrimaryCurrency', 'checkbox', NULL, NULL, 20.01, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_ExchangeRateSource', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_ExchangeRateSource', 'select', NULL, '2=la_FederalReserveBank,3=la_EuropeanCentralBank,1=la_BankOfLatvia', 20.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_ExchangeRateSource', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_ExchangeRateSource', 'select', NULL, '2=la_FederalReserveBank||3=la_EuropeanCentralBank||1=la_BankOfLatvia', 20.02, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_DefaultCouponDuration', '14', 'In-Commerce', 'in-commerce:general', 'la_Text_Coupons', 'la_conf_DefaultCouponDuration', 'text', NULL, NULL, 30.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_RegisterAsAffiliate', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_register_as_affiliate', 'checkbox', NULL, '', 40.01, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AffiliateStorageMethod', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_affiliate_storage_method', 'radio', NULL, '1=la_opt_Session,2=la_opt_PermanentCookie', 40.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AffiliateStorageMethod', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_affiliate_storage_method', 'radio', NULL, '1=la_opt_Session||2=la_opt_PermanentCookie', 40.02, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AffiliateCookieDuration', '30', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_affiliate_cookie_duration', 'text', NULL, '', 40.03, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_PriceBracketCalculation', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_PricingCalculation', 'la_prompt_PriceBracketCalculation', 'radio', NULL, '1=la_opt_PriceCalculationByPrimary,2=la_opt_PriceCalculationByOptimal', 50, 0, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_PriceBracketCalculation', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_PricingCalculation', 'la_prompt_PriceBracketCalculation', 'radio', NULL, '1=la_opt_PriceCalculationByPrimary||2=la_opt_PriceCalculationByOptimal', 50, 0, 1);
 
 # Section "in-commerce:output":
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsBy', 'Name', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_OrderProductsBy', 'select', NULL, '=la_none,Name=la_fld_Title,SKU=la_fld_SKU,Manufacturer=la_fld_Manufacturer,Price=la_fld_Price,CreatedOn=la_fld_CreatedOn,Modified=la_fld_Modified,Qty=la_fld_Qty,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 11) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsByDir', 'ASC', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_OrderProductsBy', 'select', NULL, 'ASC=la_common_Ascending,DESC=la_common_Descending', 10.01, 2, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsThenBy', 'Price', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_ThenBy', 'select', NULL, '=la_none,Name=la_fld_Title,SKU=la_fld_SKU,Manufacturer=la_fld_Manufacturer,Price=la_fld_Price,CreatedOn=la_fld_CreatedOn,Modified=la_fld_Modified,Qty=la_fld_Qty,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 11) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsThenByDir', 'ASC', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_ThenBy', 'select', NULL, 'ASC=la_common_Ascending,DESC=la_common_Descending', 10.02, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsBy', 'Name', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_OrderProductsBy', 'select', NULL, '=la_none||Name=la_fld_Title||SKU=la_fld_SKU||Manufacturer=la_fld_Manufacturer||Price=la_fld_Price||CreatedOn=la_fld_CreatedOn||Modified=la_fld_Modified||Qty=la_fld_Qty||<SQL>SELECT Prompt AS OptionName CONCAT("cust_" FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 11) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsByDir', 'ASC', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_OrderProductsBy', 'select', NULL, 'ASC=la_common_Ascending||DESC=la_common_Descending', 10.01, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsThenBy', 'Price', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_ThenBy', 'select', NULL, '=la_none||Name=la_fld_Title||SKU=la_fld_SKU||Manufacturer=la_fld_Manufacturer||Price=la_fld_Price||CreatedOn=la_fld_CreatedOn||Modified=la_fld_Modified||Qty=la_fld_Qty||<SQL>SELECT Prompt AS OptionName CONCAT("cust_" FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 11) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_OrderProductsThenByDir', 'ASC', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_ThenBy', 'select', NULL, 'ASC=la_common_Ascending||DESC=la_common_Descending', 10.02, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Products', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_Perpage_Products', 'text', NULL, NULL, 10.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Products_Short', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_Perpage_Products_Shortlist', 'text', NULL, NULL, 10.04, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Product_NewDays', '7', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_DaysToBeNew', 'text', NULL, NULL, 10.05, 0, 1);
@@ -52,11 +52,11 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Product_MaxHotNumber', '5', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_fld_Product_MaxHotNumber', 'text', NULL, NULL, 10.08, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'products_EditorPicksAboveRegular', '1', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_EditorPicksAboveRegular', 'checkbox', NULL, NULL, 10.09, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_RatingDelay_Value', '30', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.1, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_RatingDelay_Interval', '86400', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', '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.1, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_RatingDelay_Interval', '86400', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', '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.1, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ShowProductImagesInOrders', '0', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_config_ShowProductImagesInOrders', 'checkbox', NULL, NULL, 10.11, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Reviews', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', 'la_config_PerpageReviews', 'text', NULL, NULL, 20.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_ReviewDelay_Value', '30', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 20.02, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_ReviewDelay_Interval', '86400', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', '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', 20.02, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'product_ReviewDelay_Interval', '86400', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', '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', 20.02, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Manufacturers', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Manufacturers', 'la_Perpage_Manufacturers', 'text', NULL, NULL, 30.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Manufacturers_Short', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Manufacturers', 'la_Perpage_Manufacturers_Short', 'text', NULL, NULL, 30.02, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_CategoryTemplate', '/in-commerce/designs/section', 'In-Commerce', 'in-commerce:output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 40.01, 0, 0);
Index: in-commerce/install/upgrades.sql
===================================================================
--- in-commerce/install/upgrades.sql	(revision 13329)
+++ in-commerce/install/upgrades.sql	(working copy)
@@ -122,4 +122,8 @@
 # ===== v 5.0.2 =====
 
 # ===== v 5.1.0-B1 =====
-UPDATE Modules SET Path = 'modules/in-commerce/' WHERE `Name` = 'In-Commerce';
\ No newline at end of file
+UPDATE Modules SET Path = 'modules/in-commerce/' WHERE `Name` = 'In-Commerce';
+
+UPDATE ConfigurationValues
+SET ValueList = '0=lu_none||<SQL+>SELECT l%3$s_Name AS OptionName, CountryStateId AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>'
+WHERE ValueList = '0=lu_none||<SQL>SELECT DestName AS OptionName, DestAbbr AS OptionValue FROM <PREFIX>StdDestinations WHERE DestParentId IS NULL Order BY OptionName</SQL>';
\ No newline at end of file
Index: in-commerce/units/addresses/addresses_config.php
===================================================================
--- in-commerce/units/addresses/addresses_config.php	(revision 13329)
+++ in-commerce/units/addresses/addresses_config.php	(working copy)
@@ -22,17 +22,6 @@
 					'AutoLoad'			=>	true,
 
 					'Hooks'				=>	Array(
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => '',
-													'HookToSpecial' => '*',
-													'HookToEvent' => Array('OnAfterItemLoad', 'OnBeforeItemCreate', 'OnBeforeItemUpdate'),
-													'DoPrefix' => '',
-													'DoSpecial' => '*',
-													'DoEvent' => 'OnPrepareStates',
-												),
-
 												// create/update profile addres (in addresses table)
 												Array(
 													'Mode' => hAFTER,
@@ -108,11 +97,10 @@
 							'type' => 'string',
 							'formatter' => 'kOptionsFormatter',
             				'options_sql' => '	SELECT %1$s
-												FROM '.TABLE_PREFIX.'StdDestinations
-												LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
-												WHERE DestType = 1
-												ORDER BY l%2$s_Translation',
-            				'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation',
+												FROM ' . TABLE_PREFIX . 'CountryStates
+												WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+												ORDER BY l%2$s_Name',
+            				'option_key_field' => 'IsoCode', 'option_title_field' => 'l%2$s_Name',
             				'not_null' => '1', 'required' => 1, 'default' => ''
 						),
 
Index: in-commerce/units/addresses/addresses_event_handler.php
===================================================================
--- in-commerce/units/addresses/addresses_event_handler.php	(revision 13329)
+++ in-commerce/units/addresses/addresses_event_handler.php	(working copy)
@@ -88,17 +88,18 @@
 				return ;
 			}
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$cs_helper->CheckStateField($event, 'State', 'Country');
+			$cs_helper->PopulateStates($event, 'State', 'Country');
+
 			$this->processLastUsed($object, 'Shipping');
 			$this->processLastUsed($object, 'Billing');
 		}
 
 		function OnUpdate(&$event)
 		{
-			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
-
-			$cs_helper->CheckStateField($event, 'State', 'Country');
-
 			parent::OnUpdate($event);
 
 			$this->setNextTemplate($event);
@@ -111,11 +112,6 @@
 		 */
 		function OnCreate(&$event)
 		{
-			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
-
-			$cs_helper->CheckStateField($event, 'State', 'Country');
-
 			parent::OnCreate($event);
 
 			$this->setNextTemplate($event);
@@ -140,22 +136,20 @@
 		}
 
 		/**
-		 * [HOOK] Prefill states dropdown with correct values
+		 * Fills states for object country
 		 *
 		 * @param kEvent $event
-		 * @access public
 		 */
-		function OnPrepareStates(&$event)
+		function OnAfterItemLoad(&$event)
 		{
+			parent::OnAfterItemLoad($event);
+
 			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
 			$cs_helper->PopulateStates($event, 'State', 'Country');
-
-			$object =& $event->MasterEvent->getObject();
-
-			if( $object->isRequired('Country') && $cs_helper->CountryHasStates( $object->GetDBField('Country') ) ) $object->setRequired('State', true);
 		}
 
-
 		/**
 		 * [HOOK] Update PortalUser table when address marked as ProfileAddress is changed via addr prefix object
 		 *
@@ -303,6 +297,12 @@
 
 			$object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$cs_helper->CheckStateField($event, 'State', 'Country');
+			$cs_helper->PopulateStates($event, 'State', 'Country');
+
 			$this->processLastUsed($object, 'Shipping');
 			$this->processLastUsed($object, 'Billing');
 		}
Index: in-commerce/units/gateways/gw_classes/authorizenet.php
===================================================================
--- in-commerce/units/gateways/gw_classes/authorizenet.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/authorizenet.php	(working copy)
@@ -53,9 +53,11 @@
 			}
 			$post_fields['x_email'] = $billing_email;
 			$post_fields['x_phone'] = $item_data['BillingPhone'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$post_fields['x_country']			=	$this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$post_fields['x_country']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$post_fields['x_cust_id']			=	$item_data['PortalUserId'];
 			$post_fields['x_invoice_num']		=	$item_data['OrderNumber'];
 			$post_fields['x_description']		=	'Invoice #'.$item_data['OrderNumber'];
Index: in-commerce/units/gateways/gw_classes/google_checkout.php
===================================================================
--- in-commerce/units/gateways/gw_classes/google_checkout.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/google_checkout.php	(working copy)
@@ -363,8 +363,11 @@
 				'ShippingZip' => $address_info['POSTAL-CODE'],
 			);
 
-			$shipping_address['ShippingCountry'] = $this->getCountryISO($address_info['COUNTRY-CODE']);
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
 
+			$shipping_address['ShippingCountry'] = $cs_helper->getCountryIso($address_info['COUNTRY-CODE'], true);
+
 			$order->SetDBFieldsFromHash($shipping_address);
 			$order->Update();
 
@@ -514,6 +517,10 @@
 				'REGION' => 'State',
 				'POSTAL-CODE' => 'Zip',
 			);
+
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
 			foreach ($user_address as $field_prefix => $address_details) {
 				foreach ($address_mapping as $src_field => $dst_field) {
 					$order->SetDBField($field_prefix.$dst_field, $address_details[$src_field]);
@@ -523,7 +530,7 @@
 					$order->SetDBField($field_prefix.'Phone', '-'); // required field
 				}
 
-				$order->SetDBField($field_prefix.'Country', $this->getCountryISO($address_details['COUNTRY-CODE']));
+				$order->SetDBField( $field_prefix.'Country', $cs_helper->getCountryIso($address_details['COUNTRY-CODE'], true) );
 			}
 
 			$order->SetDBField('OnHold', 1);
@@ -808,20 +815,6 @@
 		}
 
 		/**
-		 * Returns 3 symbols ISO code from 2 symbols ISO code
-		 *
-		 * @param string $country_code
-		 * @return string
-		 */
-		function getCountryISO($country_code)
-		{
-			$sql = 'SELECT DestAbbr
-					FROM '.TABLE_PREFIX.'StdDestinations
-					WHERE DestAbbr2 = '.$this->Conn->qstr($country_code);
-			return $this->Conn->GetOne($sql);
-		}
-
-		/**
 		 * Retrieves shipping types available for given order
 		 *
 		 * @param OrdersItem $order
Index: in-commerce/units/gateways/gw_classes/multicards.php
===================================================================
--- in-commerce/units/gateways/gw_classes/multicards.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/multicards.php	(working copy)
@@ -91,8 +91,6 @@
 			$ret['cust_city'] = $item_data['BillingCity'];
 			$ret['cust_state'] = $item_data['BillingState'];
 			$ret['cust_zip'] = $item_data['BillingZip'] ? $item_data['BillingZip'] : '99999';
-//			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-//			$ret['country'] = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
 			$ret['cust_country'] = $item_data['BillingCountry'];
 
 			$ret['user1'] = $this->Application->GetSID().','.MD5($item_data['OrderId']);
Index: in-commerce/units/gateways/gw_classes/paymentech.php
===================================================================
--- in-commerce/units/gateways/gw_classes/paymentech.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/paymentech.php	(working copy)
@@ -72,9 +72,11 @@
 				'ShippingRef' => '',
 			);
 
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$data['AVScountryCode']	=	$this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
 
+			$data['AVScountryCode'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
+
 			if ($data['AVScountryCode'] != 'US') {
 				$data['AVSstate'] = '';
 			}
Index: in-commerce/units/gateways/gw_classes/paypal.php
===================================================================
--- in-commerce/units/gateways/gw_classes/paypal.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/paypal.php	(working copy)
@@ -80,9 +80,11 @@
 			$ret['city'] = $item_data['BillingCity'];
 			$ret['state'] = $item_data['BillingState'];
 			$ret['zip'] = $item_data['BillingZip'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$ret['country'] = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['notify_url'] = $this->Application->BaseURL('/in-commerce').'gw_notify.php?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'];
 			$ret['cmd'] = '_xclick'; // act as "Buy Now" PayPal button
 			return $ret;
@@ -142,9 +144,11 @@
 			$ret['city'] = $item_data['BillingCity'];
 			$ret['state'] = $item_data['BillingState'];
 			$ret['zip'] = $item_data['BillingZip'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$ret['country'] = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['notify_url'] = $this->Application->BaseURL('/in-commerce').'gw_notify.php?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'].'&payment_type_id='.$tag_params['payment_type_id'];
 			$ret['cmd'] = '_xclick-subscriptions'; // act as "Buy Now" PayPal button
 
Index: in-commerce/units/gateways/gw_classes/paypal_direct.php
===================================================================
--- in-commerce/units/gateways/gw_classes/paypal_direct.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/paypal_direct.php	(working copy)
@@ -76,8 +76,11 @@
 			$post_fields['STREET2']				=	$item_data['BillingAddress2'];
 			$post_fields['CITY']				=	$item_data['BillingCity'];
 			$post_fields['STATE']				=	$item_data['BillingState'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$post_fields['COUNTRYCODE']			=	$this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
+
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$post_fields['COUNTRYCODE']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$post_fields['ZIP']					=	$item_data['BillingZip'];
 			$post_fields['INVNUM']				=	$item_data['OrderNumber'];
 			$post_fields['CUSTOM']				=	$item_data['PortalUserId'];
@@ -115,8 +118,7 @@
 			}
 			$post_fields['x_email'] = $billing_email;
 			$post_fields['x_phone'] = $item_data['BillingPhone'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$post_fields['x_country']			=	$this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
+			$post_fields['x_country']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
 
 			$post_fields['x_cust_id']			=	$item_data['PortalUserId'];
 			$post_fields['x_invoice_num']		=	$item_data['OrderNumber'];
Index: in-commerce/units/gateways/gw_classes/worldpay.php
===================================================================
--- in-commerce/units/gateways/gw_classes/worldpay.php	(revision 13329)
+++ in-commerce/units/gateways/gw_classes/worldpay.php	(working copy)
@@ -74,8 +74,10 @@
 			}
 			$ret['postcode'] = $item_data['BillingZip'];
 
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$ret['country'] = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['tel'] = $item_data['BillingPhone'];
 			$ret['fax'] = $item_data['BillingFax'];
 			$ret['email'] = $item_data['BillingEmail'];
Index: in-commerce/units/gift_certificates/gift_certificates_config.php
===================================================================
--- in-commerce/units/gift_certificates/gift_certificates_config.php	(revision 13329)
+++ in-commerce/units/gift_certificates/gift_certificates_config.php	(working copy)
@@ -112,11 +112,10 @@
 				'type' => 'string',
 				'formatter' => 'kOptionsFormatter',
             	'options_sql' => '	SELECT %1$s
-									FROM '.TABLE_PREFIX.'StdDestinations
-									LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
-									WHERE DestType = 1
-									ORDER BY l%2$s_Translation',
-				'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation',
+									FROM '.TABLE_PREFIX.'CountryStates
+									WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+									ORDER BY l%2$s_Name',
+				'option_key_field' => 'IsoCode', 'option_title_field' => 'l%2$s_Name',
 				'not_null' => 1, 'required' => 1, 'default' => 'USA'
 			),
 
Index: in-commerce/units/manufacturers/manufacturers_config.php
===================================================================
--- in-commerce/units/manufacturers/manufacturers_config.php	(revision 13329)
+++ in-commerce/units/manufacturers/manufacturers_config.php	(working copy)
@@ -20,18 +20,7 @@
 					'EventHandlerClass'	=>	Array('class'=>'ManufacturersEventHandler','file'=>'manufacturers_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'ManufacturersTagProcessor','file'=>'manufacturers_tag_processor.php','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
-					'Hooks'				=>	Array(
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => 'manuf',
-													'HookToSpecial' => '',
-													'HookToEvent' => Array('OnAfterItemLoad', 'OnBeforeItemCreate', 'OnBeforeItemUpdate', 'OnUpdateAddress'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnPrepareStates',
-												),
-						),
+
 					'QueryString'		=>	Array(
 												1 => 'id',
 												2 => 'Page',
@@ -116,11 +105,10 @@
 				        	'type' => 'string',
 				        	'formatter' => 'kOptionsFormatter',
 				            'options_sql' => '	SELECT %1$s
-												FROM '.TABLE_PREFIX.'StdDestinations
-												LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
-												WHERE DestType = 1
-												ORDER BY l%2$s_Translation',
-			            	'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation', 'default' => null
+												FROM '.TABLE_PREFIX.'CountryStates
+												WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+												ORDER BY l%2$s_Name',
+			            	'option_key_field' => 'IsoCode', 'option_title_field' => 'l%2$s_Name', 'default' => null
 			           	),
 					),
 
Index: in-commerce/units/manufacturers/manufacturers_event_handler.php
===================================================================
--- in-commerce/units/manufacturers/manufacturers_event_handler.php	(revision 13329)
+++ in-commerce/units/manufacturers/manufacturers_event_handler.php	(working copy)
@@ -79,38 +79,45 @@
 	 * @param kEvent $event
 	 * @access public
 	 */
-	function OnPrepareStates(&$event)
+	function OnAfterItemLoad(&$event)
 	{
+		parent::OnAfterItemLoad($event);
+
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
 		$cs_helper->PopulateStates($event, 'State', 'Country');
-
-		$object =& $event->getObject();
-
-		if( $object->isRequired('Country') && $cs_helper->CountryHasStates( $object->GetDBField('Country') ) ) $object->setRequired('State', true);
 	}
 
-	function OnUpdate(&$event)
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeItemUpdate(&$event)
 	{
+		parent::OnBeforeItemUpdate($event);
+
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
 		$cs_helper->CheckStateField($event, 'State', 'Country');
-
-		parent::OnUpdate($event);
+		$cs_helper->PopulateStates($event, 'State', 'Country');
 	}
 
-	function OnCreate(&$event)
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeItemCreate(&$event)
 	{
+		parent::OnBeforeItemCreate($event);
+
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-		$cs_helper->CheckStateField($event, 'State', 'Country');
+		/* @var $cs_helper kCountryStatesHelper */
 
-		parent::OnCreate($event);
-	}
-
-	function OnPreSave(&$event)
-	{
-		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
 		$cs_helper->CheckStateField($event, 'State', 'Country');
-
-		parent::OnPreSave($event);
+		$cs_helper->PopulateStates($event, 'State', 'Country');
 	}
-
 }
\ No newline at end of file
Index: in-commerce/units/orders/orders_config.php
===================================================================
--- in-commerce/units/orders/orders_config.php	(revision 13329)
+++ in-commerce/units/orders/orders_config.php	(working copy)
@@ -334,11 +334,10 @@
 							            	'type' => 'string',
 							            	'formatter' => 'kOptionsFormatter',
 							            	'options_sql' => '	SELECT %1$s
-																FROM '.TABLE_PREFIX.'StdDestinations
-																LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
-																WHERE DestType = 1
-																ORDER BY l%2$s_Translation',
-						            		'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation',
+																FROM '.TABLE_PREFIX.'CountryStates
+																WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+																ORDER BY l%2$s_Name',
+						            		'option_key_field' => 'IsoCode', 'option_title_field' => 'l%2$s_Name',
 						            		'not_null' => 1, 'default' => 'USA'
 										),
 							            'VAT' => Array('type' => 'float','formatter'=>'kFormatter','not_null'=>1,'default' => '0','format'=>'%01.2f'),
@@ -366,11 +365,10 @@
 							            'ShippingCountry' => Array(
 							            	'type' => 'string', 'formatter' => 'kOptionsFormatter',
 							            	'options_sql' => '	SELECT %1$s
-																FROM '.TABLE_PREFIX.'StdDestinations
-																LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
-																WHERE DestType = 1
-																ORDER BY l%2$s_Translation',
-							           		'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation',
+																FROM '.TABLE_PREFIX.'CountryStates
+																WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+																ORDER BY l%2$s_Name',
+							           		'option_key_field' => 'IsoCode', 'option_title_field' => 'l%2$s_Name',
 							           		'not_null' => 1, 'default' => 'USA'
 										),
 							            'ShippingType' => Array('type' => 'int','formatter'=>'kOptionsFormatter','options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'ShippingType WHERE Status = 1','option_key_field'=>'ShippingID','option_title_field'=>'Name', 'not_null' => 1, 'default' => 0),
Index: in-commerce/units/orders/orders_event_handler.php
===================================================================
--- in-commerce/units/orders/orders_event_handler.php	(revision 13329)
+++ in-commerce/units/orders/orders_event_handler.php	(working copy)
@@ -171,6 +171,8 @@
 
 		if ($shipping_address_id || $billing_address_id) {
 			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
 			$address =& $this->Application->recallObject('addr.-item','addr', Array('skip_autoload' => true));
 			$addr_list =& $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) );
 			$addr_list->Query();
@@ -592,16 +594,6 @@
 	{
 		$this->setBillingAddress($event);
 
-		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-
-		$object =& $event->getObject();
-		if( $object->HasTangibleItems() )
-		{
-			$cs_helper->CheckStateField($event, 'ShippingState', 'ShippingCountry');
-		}
-
-		$cs_helper->CheckStateField($event, 'BillingState', 'BillingCountry');
-
 		parent::OnUpdate($event);
 
 		if ($this->Application->isAdminUser) {
@@ -616,6 +608,9 @@
 		}
 		else {
 			// strange: recalculate total amount on error
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
 			$object->SetDBField('TotalAmount', $object->getTotalAmount());
 		}
 	}
@@ -664,28 +659,6 @@
 		}
 	}
 
-	/**
-	 * Enter description here...
-	 *
-	 * @param kEvent $event
-	 */
-	function OnPreSave(&$event)
-	{
-		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-
-		$object =& $event->getObject();
-		if ( $object->GetID() !== false)
-		{
-			if( $object->HasTangibleItems() )
-			{
-				$cs_helper->CheckStateField($event, 'ShippingState', 'ShippingCountry');
-			}
-			$cs_helper->CheckStateField($event, 'BillingState', 'BillingCountry');
-		}
-
-		parent::OnPreSave($event);
-	}
-
 	function OnUpdateCart(&$event)
 	{
 		$this->Application->HandleEvent($items_event, 'orditems:OnUpdate');
@@ -1199,9 +1172,8 @@
 			foreach ($req_fields as $field) {
 				$order->Fields[$field]['required'] = $has_tangibles;
 			}
-			if ($cs_helper->CountryHasStates( getArrayValue($field_values, 'ShippingCountry') )) {
-				$order->Fields['ShippingState']['required'] = true; // $has_tangibles
-			}
+
+			$order->setRequired('ShippingState', $cs_helper->CountryHasStates( $field_values['ShippingCountry'] ));
 		}
 
 		// billing address required fields
@@ -1210,9 +1182,8 @@
 			foreach ($req_fields as $field) {
 				$order->Fields[$field]['required'] = true;
 			}
-			if ($cs_helper->CountryHasStates( getArrayValue($field_values, 'BillingCountry') )) {
-				$order->Fields['BillingState']['required'] = true;
-			}
+
+			$order->setRequired('BillingState', $cs_helper->CountryHasStates( $field_values['BillingCountry'] ));
 		}
 
 		$check_cc = $this->Application->GetVar('check_credit_card');
@@ -1965,6 +1936,8 @@
 		$object->SetDBField('PaymentCVV2', $this->Application->RecallVar('CVV2Code') );
 
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
 		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
 		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
 
@@ -1975,19 +1948,49 @@
 	}
 
 	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeItemCreate(&$event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
+		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
+		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
+	}
+
+	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnBeforeItemUpdate(&$event)
 	{
+		parent::OnBeforeItemUpdate($event);
+
+		$object =& $event->getObject();
+		/* @var $object OrdersItem */
+
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
 		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
 		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
 
-		$object = &$event->getObject();
-		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) return;
+		if ($object->HasTangibleItems()) {
+			$cs_helper->CheckStateField($event, 'ShippingState', 'ShippingCountry', false);
+		}
 
+		$cs_helper->CheckStateField($event, 'BillingState', 'BillingCountry', false);
+
+		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) {
+			return ;
+		}
+
 		$this->CheckUser($event);
 		if(!$object->GetDBField('OrderIP'))
 		{
Index: in-commerce/units/orders/orders_item.php
===================================================================
--- in-commerce/units/orders/orders_item.php	(revision 13329)
+++ in-commerce/units/orders/orders_item.php	(working copy)
@@ -172,14 +172,15 @@
 		 */
 		function getTaxPercent()
 		{
-			$sql = 'SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType = %s AND DestAbbr = %s';
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
 
-			$shipping_country_id = (int) $this->Conn->GetOne( sprintf($sql, 1, $this->Conn->qstr($this->GetDBField('ShippingCountry') ) ) );
-			$shipping_state_id = (int) $this->Conn->GetOne( sprintf($sql, 2,  $this->Conn->qstr($this->GetDBField('ShippingState') ) ) );
+			$shipping_country_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingCountry'), DESTINATION_TYPE_COUNTRY);
+			$shipping_state_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingState'), DESTINATION_TYPE_STATE);
 			$shipping_zip = (string) $this->GetDBField('ShippingZip');
 
-			$billing_country_id = (int) $this->Conn->GetOne( sprintf($sql, 1, $this->Conn->qstr($this->GetDBField('BillingCountry') ) ) );
-			$billing_state_id = (int) $this->Conn->GetOne( sprintf($sql, 2, $this->Conn->qstr($this->GetDBField('BillingState') ) ) );
+			$billing_country_id = $cs_helper->getCountryStateId($this->GetDBField('BillingCountry'), DESTINATION_TYPE_COUNTRY);
+			$billing_state_id =  $cs_helper->getCountryStateId($this->GetDBField('BillingState'), DESTINATION_TYPE_STATE);
 			$billing_zip = (string) $this->GetDBField('BillingZip');
 
 			/*
Index: in-commerce/units/orders/orders_tag_processor.php
===================================================================
--- in-commerce/units/orders/orders_tag_processor.php	(revision 13329)
+++ in-commerce/units/orders/orders_tag_processor.php	(working copy)
@@ -51,10 +51,10 @@
 			foreach ($fields as $field) {
 				$value = $this->Application->ConfigValue('Comm_'.$field);
 				if ($field == 'Country') {
-					$sql = 'SELECT DestName
-							FROM '.TABLE_PREFIX.'StdDestinations
-							WHERE DestAbbr = '.$this->Conn->qstr($value);
-					$value = $this->Application->Phrase( $this->Conn->GetOne($sql) );
+					$sql = 'SELECT l' . $this->Application->GetVar('m_lang') . '_Name
+							FROM ' . TABLE_PREFIX . 'CountryStates
+							WHERE IsoCode = ' . $this->Conn->qstr($value);
+					$value = $this->Conn->GetOne($sql);
 				}
 
 				if ($field == 'Country' && $value) {
@@ -814,7 +814,7 @@
 			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
 			/* @var $cs_helper kCountryStatesHelper */
 
-			$cs_helper->PopulateStates(new kEvent('u:OnBuild') , 'State', 'Country');
+			$cs_helper->PopulateStates(new kEvent('u:OnBuild'), 'State', 'Country');
 		}
 
 		function UserLink($params)
Index: in-commerce/units/shipping_quote_engines/custom_shipping_quote_engine.php
===================================================================
--- in-commerce/units/shipping_quote_engines/custom_shipping_quote_engine.php	(revision 13329)
+++ in-commerce/units/shipping_quote_engines/custom_shipping_quote_engine.php	(working copy)
@@ -38,12 +38,16 @@
 		return $shipping_types;
 	}
 
-	function QueryShippingCost($user_country_abbr, $user_state_abbr, $user_zip, $weight, $items, $amount, $shipping_type=null, $promo_params)
+	function QueryShippingCost($user_country, $user_state, $user_zip, $weight, $items, $amount, $shipping_type=null, $promo_params)
 	{
 		$db =& $this->Application->GetADODBConnection();
 
-		$user_country_id = (int) $db->GetOne('SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1 AND DestAbbr = '.$db->qstr($user_country_abbr));
-		$user_state_id = (int) $db->GetOne('SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=2 AND DestAbbr = '.$db->qstr($user_state_abbr));
+		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
+		$user_country_id = $cs_helper->getCountryStateId($user_country, DESTINATION_TYPE_COUNTRY);
+		$user_state_id = $cs_helper->getCountryStateId($user_state, DESTINATION_TYPE_STATE);
+
 		$user_zip = (string) $user_zip;
 		$weight = (float) $weight;
 		$items = (int) $items;
Index: in-commerce/units/shipping_quote_engines/intershipper.php
===================================================================
--- in-commerce/units/shipping_quote_engines/intershipper.php	(revision 13329)
+++ in-commerce/units/shipping_quote_engines/intershipper.php	(working copy)
@@ -153,8 +153,7 @@
 			}
 		}
 
-		if(isset($custom_params['orig_addr1']))
-		{
+		if (isset($custom_params['orig_addr1'])) {
 			$params['orig_name']		=	$custom_params['orig_name'];
 			$params['orig_addr1']		=	$custom_params['orig_addr1'];
 			$params['orig_addr2']		=	$custom_params['orig_addr2'];
@@ -163,8 +162,7 @@
 			$params['orig_postal']		=	$custom_params['orig_postal'];
 			$params['orig_country']		=	$custom_params['orig_country'];
 		}
-		else
-		{
+		else {
 			$params['orig_name']		=	$this->Application->ConfigValue('Comm_StoreName');
 			$params['orig_addr1']		=	$this->Application->ConfigValue('Comm_Shipping_AddressLine1');
 			$params['orig_addr2']		=	$this->Application->ConfigValue('Comm_Shipping_AddressLine2');
@@ -173,21 +171,23 @@
 			$params['orig_postal']		=	$this->Application->ConfigValue('Comm_Shipping_ZIP');
 			$params['orig_country']		=	$this->Application->ConfigValue('Comm_Shipping_Country');
 		}
-		if( mb_strlen($params['orig_country']) == 3)
-		{
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = "'.$params['orig_country'].'"';
-			$params['orig_country'] = $db->GetOne($sql);
+
+		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
+		if (strlen($params['orig_country']) == 3) {
+			// got 3symbol ISO code -> resolve to 2symbol ISO code
+			$params['orig_country'] = $cs_helper->getCountryIso( $params['orig_country'] );
 		}
-		if( mb_strlen($params['orig_state']) != 2)
-		{
-			$sql = '	SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations
-						WHERE DestName = "'.$params['orig_state'].'"';
-			$params['orig_state'] = $db->GetOne($sql);
+
+		if (strlen($params['orig_state']) != 2) {
+			// got state name instead of ISO code -> resolve it to ISO code
+			$country_iso = $cs_helper->getCountryIso($params['orig_country'], true);
+			$params['orig_state'] = $cs_helper->getStateIso($params['orig_state'], $country_iso);
 		}
 
-		if(isset($custom_params['ShipMethod']))
-		{
-			$params['ShipMethod']		=	$custom_params['ShipMethod'];
+		if (isset($custom_params['ShipMethod'])) {
+			$params['ShipMethod']	=	$custom_params['ShipMethod'];
 		}
 
 		$params['packages']			=	$custom_params['packages'];
@@ -199,10 +199,10 @@
 		$params['dest_state']		=	$custom_params['dest_state'];
 		$params['dest_postal']		=	$custom_params['dest_postal'];
 		$params['dest_country']		=	$custom_params['dest_country'];
-		if( mb_strlen($params['dest_country']) == 3)
-		{
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = "'.$params['dest_country'].'"';
-			$params['dest_country'] = $db->GetOne($sql);
+
+		if (strlen($params['dest_country']) == 3) {
+			// got 3symbol ISO code -> resolve to 2symbol ISO code
+			$params['dest_country'] = $cs_helper->getCountryIso( $params['dest_country'] );
 		}
 
 		if(!$params['dest_city'] || !$params['dest_country'] ||
Index: in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
===================================================================
--- in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(revision 13329)
+++ in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(working copy)
@@ -57,11 +57,14 @@
 		$object->SetDBField('Properties', $properties);
 
 		$from_country = $this->Application->ConfigValue('Comm_Shipping_Country');
-		if( mb_strlen($from_country) == 3)
-		{
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = "'.$from_country.'"';
-			$from_country = $this->Conn->GetOne($sql);
+		if (strlen($from_country) == 3) {
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			// get 2symbol ISO code from 3symbol ISO code
+			$from_country = $cs_helper->getCountryIso($from_country);
 		}
+
 		if( !function_exists('curl_init') )
 		{
 			$object->FieldErrors['Status']['pseudo'] = 'curl_not_present';
Index: in-commerce/units/shipping_quote_engines/usps.php
===================================================================
--- in-commerce/units/shipping_quote_engines/usps.php	(revision 13329)
+++ in-commerce/units/shipping_quote_engines/usps.php	(working copy)
@@ -84,16 +84,9 @@
 		$country = $this->Application->ConfigValue('Comm_Shipping_Country');
 
 		if ($country != '') {
-			$db =& $this->Application->GetADODBConnection();
-			$this->shipping_origin_country = $db->GetOne(
-				'SELECT DestAbbr2
-					FROM '.TABLE_PREFIX.'StdDestinations
-					WHERE
-						DestAbbr = '.$db->qstr($country).'
-						AND destType = 1
-				'
-			);
+			$this->shipping_origin_country = $this->GetUSPSCountry($country, '');
 		}
+
 		$contact_name = trim($this->_prepare_xml_param($this->Application->ConfigValue('Comm_Contacts_Name')));
 		$split_pos = strpos($contact_name, ' ');
 		if ($split_pos === false) {
@@ -1003,11 +996,14 @@
 		return array('TrackingNumber' => $TrackingNumber, 'PostnetBarCode' => $PostnetBarCode, 'Postage' => $Postage);
 	}
 
-	function GetUSPSCountry($country)
+	function GetUSPSCountry($country, $default = 'US')
 	{
-		$country = $this->Application->Conn->GetOne('SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = '.$this->Application->Conn->qstr($country));
-		if ( $country == '' ) $country = 'US';
-		return $country;
+		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
+		$country = $cs_helper->getCountryIso($country);
+
+		return $country == '' ? $default : $country;
 	}
 
 	function GetShippingQuotes($params = null)
Index: in-commerce/units/taxes/taxes_tag_processor.php
===================================================================
--- in-commerce/units/taxes/taxes_tag_processor.php	(revision 13329)
+++ in-commerce/units/taxes/taxes_tag_processor.php	(working copy)
@@ -15,457 +15,259 @@
 
 class TaxesTagProcessor extends kDBTagProcessor
 {
-	/*
-	function ShowDestinations($param)
+
+	function ShowCountries($params)
 	{
-		$zone =& $this->Application->recallObject('tax');
-		$zone->SetDBField('TaxZoneId', $zone->ID);
-		$destination =& $this->Application->recallObject('taxdst');
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		if(!$this->Application->GetVar('loaded'))
-		{
-			if ($zone->GetID() == 0)
-			{
-				$this->Application->DeleteVar('taxdst');
-			}
-			else
-			{
-				$sql = 'SELECT * FROM '.$destination->TableName.' WHERE TaxZoneId='.$zone->GetID();
-				$res = $this->Conn->Query($sql);
-				if (is_array($res)) foreach ($res as $dest_record)
-				{
-					$temp[$dest_record['TaxZoneDestId']]['TaxZoneDestId'] = $dest_record['TaxZoneDestId'];
-					$temp[$dest_record['TaxZoneDestId']]['StdDestId'] = $dest_record['StdDestId'];
-					$temp[$dest_record['TaxZoneDestId']]['DestValue'] = $dest_record['DestValue'];
-				}
-				$this->Application->SetVar('taxdst', $temp);
-			}
-		}
-		$destination =& $this->Application->recallObject('taxdst');
+		$destination_table = $this->getDestinationsTable($params);
+		$selected_country_id = (int)$this->Application->GetVar('CountrySelector');
 
-		$hidden_clause = '<input type="hidden" name="loaded" value="1"><input type="hidden" name="zone_id" value="'.$zone->GetDBField('TaxZoneId').'">';
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
 
-		switch ( $zone->GetDBField('Type') )
-		{
-			case 1:
+		switch ($params['show']) {
+			case 'current':
+				// selected countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.TaxZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
+				break;
 
-				$sql = 'SELECT * FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1';
-				$res = $this->Conn->Query($sql, 'DestId');
-
-				$dropdown = '<select name="country">'."\n";
-				foreach ($res as $record)
-				{
-					$dropdown .= '<option value="'.$record['DestId'].'">'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-				}
-				$dropdown .= '</select>'."\n";
-
-				$form_params = Array();
-				$form_params['dropdown'] = $dropdown;
-				$form_params['block'] = $param['block'];
-				$form_params['res'] = $res;
-				$ret = $this->ShowDestionationForm($form_params);
+			case 'available':
+				// available countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.TaxZoneId IS NULL
+						ORDER BY cs.' . $name_field;
 				break;
-			case 2:
 
-				$country_sql = 'SELECT d1.* FROM '.TABLE_PREFIX.'StdDestinations d1,
-								'.TABLE_PREFIX.'StdDestinations d2
-								WHERE d1.DestType=1 AND d1.DestId=d2.DestParentId
-								GROUP BY d1.DestId';
-				if( !($current_country = $this->Application->GetVar('StatesCountry')) )
-				{
-					$current_country_sql = 'SELECT sd.DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-												LEFT JOIN '.$destination->TableName.' zd
-												ON zd.StdDestId = sd.DestId
-												WHERE sd.DestType=2 AND zd.TaxZoneId='.$zone->GetDBField('TaxZoneId');
-					if($zone->GetDBField('TaxZoneId'))
-					{
-						$current_country = $this->Conn->GetOne($current_country_sql);
-					}
+			case 'all':
+				// always preselect 1st country, when user haven't selected any
+				if (!$selected_country_id) {
+					$sql = 'SELECT StdDestId
+							FROM ' . $destination_table . '
+							WHERE TaxZoneId = ' . $object->GetID();
+					$selected_country_id = $this->Conn->GetOne($sql);
 
-					if(!$current_country)
-					{
-						$current_country_sql = 'SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1';
-						$current_country = $this->Conn->GetOne($current_country_sql);
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
 				}
-				$states_sql = 'SELECT * FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=2 AND DestParentId='.$current_country;
-				$countries = $this->Conn->Query($country_sql, 'DestId');
-				$states = $this->Conn->Query($states_sql, 'DestId');
 
-				if($countries)
-				{
-					$countries_dropdown = '<select name="StatesCountry" onchange="submit_event(\'tax\', \'OnCountryChange\')">'."\n";
-					foreach ($countries as $record)
-					{
-						$countries_dropdown .= '<option value="'.$record['DestId'].'" ';
-						if($record['DestId'] == $current_country)
-						{
-							$countries_dropdown .= 'selected';
-						}
-						$countries_dropdown .= '>'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-					}
-					$countries_dropdown .= '</select>'."\n";
-				}
-
-				if($states)
-				{
-					$states_dropdown = '<select name="state">'."\n";
-					foreach ($states as $id => $record)
-					{
-						$states_dropdown .= '<option value="'.$record['DestId'].'">'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-					}
-					$states_dropdown .= '</select>'."\n";
-				}
-
-				$form_params = Array();
-				$table = '<table border="0"><tr><td>'.$this->Application->Phrase('la_Country').': </td><td>'.$countries_dropdown.'</td></tr>';
-				$table .= '<tr><td>'.$this->Application->Phrase('la_State').': </td><td>'.$states_dropdown.'</td></tr></table>';
-				$form_params['dropdown'] = $table;
-				$form_params['block'] = $param['block'];
-				$form_params['res'] = $states;
-				$ret = $this->ShowDestionationForm($form_params);
-
+				// all countries
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+						ORDER BY ' . $name_field;
 				break;
-			case 3:
 
-			if( !($current_country = $this->Application->GetVar('StatesCountry')) )
-				{
-					$current_country_sql = 'SELECT sd.DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-												LEFT JOIN '.$destination->TableName.' zd
-												ON zd.StdDestId = sd.DestId
-												WHERE sd.DestType=2 AND zd.TaxZoneId='.$zone->GetDBField('TaxZoneId');
-					if($zone->GetDBField('TaxZoneId'))
-					{
-						$current_country = $this->Conn->GetOne($current_country_sql);
-					}
+			case 'has_states':
+				$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+				/* @var $cs_helper kCountryStatesHelper */
 
-					if(!$current_country)
-					{
-						$current_country_sql = 'SELECT StdDestId FROM '.$destination->TableName.' WHERE TaxZoneId='.$zone->GetID();
-						$current_country = $this->Conn->GetOne($current_country_sql);
-					}
+				$has_states = $cs_helper->getCountriesWithStates();
 
-					if(!$current_country)
-					{
-						$current_country_sql = 'SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1';
-						$current_country = $this->Conn->GetOne($current_country_sql);
-					}
-
-
+				if ($selected_country_id && !array_key_exists($selected_country_id, $has_states)) {
+					list ($selected_country_id, ) = each($has_states);
+					$this->Application->SetVar('CountrySelector', $selected_country_id);
 				}
 
-				$country_sql = 'SELECT d1.* FROM '.TABLE_PREFIX.'StdDestinations d1
-								WHERE d1.DestType=1
-								GROUP BY d1.DestId';
-				$countries = $this->Conn->Query($country_sql, 'DestId');
+				// preselect country from 1st found state
+				if (!$selected_country_id) {
+					$sql = 'SELECT cs.StateCountryId
+							FROM ' . $table_name . ' cs
+							LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+							WHERE (cs.Type = ' . DESTINATION_TYPE_STATE . ') AND (zd.TaxZoneId = ' . $object->GetID() . ')';
+					$selected_country_id = $this->Conn->GetOne($sql);
 
-				if($countries)
-				{
-					$countries_dropdown = '<select name="StatesCountry" onchange="submit_event(\'tax\', \'OnCountryChange\')">'."\n";
-					foreach ($countries as $record)
-					{
-						print "<br>";
-						$countries_dropdown .= '<option value="'.$record['DestId'].'" ';
-						if($record['DestId'] == $current_country)
-						{
-							$countries_dropdown .= 'selected';
-						}
-						$countries_dropdown .= '>'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
-					$countries_dropdown .= '</select>'."\n";
-				}
-
-				$sql = 'SELECT DestValue FROM '.$this->Application->getUnitOption('taxdst', 'TableName').' WHERE NOT(DestValue IS NULL) AND DestValue<>"" AND StdDestId='.$current_country;
-				$res = array_unique( $this->Conn->GetCol($sql) );
-				$dropdown = '<input type="text" name="zip_input" id="zip_input" size="15">';
-				if($res)
-				{
-					$dropdown .= ' or <select name="zip_dropdown">'."\n";
-					$dropdown .= '<option value=""></option>';
-					foreach ($res as $record)
-					{
-						$dropdown .= '<option value="'.$record.'">'.$record.'</option>'."\n";
+					else {
+						list ($selected_country_id, ) = each($has_states);
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
-					$dropdown .= '</select>'."\n";
 				}
 
-				$table = '<table border="0"><tr><td>'.$this->Application->Phrase('la_Country').': </td><td>'.$countries_dropdown.'</td></tr>';
-				$table .= '<tr><td>'.$this->Application->Phrase('la_fld_ZIP').': </td><td>'.$dropdown.'</td></tr></table>';
-
-				$form_params = Array();
-				$form_params['dropdown'] = $table;
-				$form_params['block'] = $param['block'];
-				$form_params['res'] = $res;
-				$ret = $this->ShowDestionationForm($form_params);
-
+				// gets only countries with states
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' AND ' . $id_field . ' IN (' . implode(',', array_keys($has_states)) . ')
+						ORDER BY ' . $name_field;
 				break;
+
 			default:
+				trigger_error('Unknown "show" parameter value "' . $params['show'] . '" used.', E_USER_ERROR);
+				break;
 		}
 
-		$ret .= $hidden_clause;
-		return $ret;
-	}
-	*/
-	/*
-	function ShowDestionationForm($param)
-	{
-		$add_button = '<input type="button" class="button" value="'.$this->Application->Phrase('la_btn_AddLocation').'" onclick="submit_event(\'tax\', \'OnAddLocation\')">';
+		$ret = '';
+		$countries = $this->Conn->GetCol($sql, $id_field);
 
-		$main_processor =& $this->Application->RecallObject('m_TagProcessor');
-		$oddevenparam['odd'] = 'table-color1';
-		$oddevenparam['even'] = 'table-color2';
-		$ret = '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td></td><td>'.$param['dropdown'].'</td><td>'.$add_button.'</td></tr>';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
 
-		$dest_list = $this->Application->GetVar('taxdst');
-		if (is_array($dest_list))
-		{
+		foreach ($countries as $country_id => $country_name) {
+			$block_params['id'] = $country_id;
+			$block_params['destination_title'] = $country_name;
+			$block_params['selected'] = $selected_country_id == $country_id ? ' selected="selected"' : '';
 
-
-			if (sizeof($dest_list)>0){
-				$ret .= '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td>&nbsp;</td><td>';
-				$ret .= '<select multiple name="location_list" onchange="SelectToString(this)">';
-				$hidden = '';
-
-				foreach ($dest_list as $id => $destination)
-				{
-					$params = $destination;
-					$params['id'] = $id;
-					$hidden .= '<input type="hidden" id="taxdst['.$destination['TaxZoneDestId'].'][TaxZoneDestId]" name="taxdst['.$destination['TaxZoneDestId'].'][TaxZoneDestId]" value="'.$destination['TaxZoneDestId'].'">';
-					if($destination['StdDestId'] && !$destination['DestValue'])
-					{
-						$params['destination_title'] = $param['res'][$destination['StdDestId']]['DestName'];
-						$hidden .= '<input type="hidden" id="taxdst['.$destination['TaxZoneDestId'].'][StdDestId]" name="taxdst['.$destination['TaxZoneDestId'].'][StdDestId]" value="'.$destination['StdDestId'].'">';
-					}
-					else
-					{
-						$params['destination_title'] = $destination['DestValue'];
-						$hidden .= '<input type="hidden" id="taxdst['.$destination['TaxZoneDestId'].'][DestValue]" name="taxdst['.$destination['TaxZoneDestId'].'][DestValue]" value="'.$destination['DestValue'].'">';
-					}
-
-					$params['name']	= $param['block'];
-					$ret .= $main_processor->ParseBlock($params);
-				}
-				$ret .= '</select>';
-
-				$ret .= '</td><td><input type="button" class="button" value="'.$this->Application->Phrase('la_btn_RemoveLocations').'" onclick="remove_location('.$destination['TaxZoneDestId'].')">';
-				$ret .= $hidden;
-				$ret .= "&nbsp;</td></tr>";
-			}else{
-
-			}
+			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
-//		<input type="hidden" id="taxdst[<inp:m_param name="id"/>][TaxZoneDestId]" name="taxdst[<inp:m_param name="id"/>][TaxZoneDestId]" value="<inp:m_param name="id"/>">
 		return $ret;
 	}
-	*/
-	function ShowCountries($param){
 
-		$param = $this->prepareTagParams($param);
-		$param['name'] = $param['block'];
+	function ShowStates($params)
+	{
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		$destination 	= &$this->Application->recallObject('taxdst');
-		$zone 			= &$this->Application->recallObject('tax');
+		$destination_table = $this->getDestinationsTable($params);
 
-		switch ($param['show']){
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
+
+		$country_id = $this->Application->GetVar('CountrySelector');
+
+		switch ($params['show']) {
 			case 'current':
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1 AND zd.TaxZoneId = '.$zone->GetDBField('TaxZoneId').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+				// selected states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . ' AND
+							cs.StateCountryId = ' . $country_id . ' AND
+							zd.TaxZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
 				break;
 
 			case 'available':
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1 AND zd.TaxZoneId IS NULL
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+				// available states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . '
+							AND zd.TaxZoneId IS NULL
+							AND cs.StateCountryId = ' . $country_id . '
+						ORDER BY cs.' . $name_field;
 				break;
 
 			case 'all':
-				$selected_country = $this->Application->GetVar('CountrySelector');
-				if (!$selected_country){
-					// get 1st available country ID
-					$selected_country = $this->Conn->GetOne('SELECT StdDestId FROM '.$destination->TableName.'
-								WHERE TaxZoneId='.$zone->GetDBField('TaxZoneId'));
-					if ($selected_country){
-						$this->Application->SetVar('CountrySelector', $selected_country);
-					}
-				}
-
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+				// all possible states for selected country
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_STATE . ' AND StateCountryId = ' . $country_id . '
+						ORDER BY ' . $name_field;
 				break;
 
-			case 'has_states':
-				$has_states = $this->Conn->GetCol('SELECT DISTINCT DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-												WHERE sd.DestType=2');
-				$selected_country = $this->Application->GetVar('CountrySelector');
-
-				if ($selected_country && !in_array($selected_country, $has_states)){
-					$selected_country = $has_states[0];
-					$this->Application->SetVar('CountrySelector', $selected_country);
-				}
-
-				if (!$selected_country){
-					// get 1st available country ID
-					$selected_country = $this->Conn->GetOne('SELECT DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-								LEFT JOIN '.$destination->TableName.' zd
-								ON zd.StdDestId = sd.DestId
-								WHERE sd.DestType=2
-								AND zd.TaxZoneId='.$zone->GetDBField('TaxZoneId'));
-					if ($selected_country){
-						$this->Application->SetVar('CountrySelector', $selected_country);
-					}
-					else {
-						$selected_country = $has_states[0];
-						$this->Application->SetVar('CountrySelector', $selected_country);
-					}
-				}
-
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1 AND DestId IN ('.implode(',', $has_states).')
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+			default:
+				trigger_error('Unknown "show" parameter value "' . $params['show'] . '" used.', E_USER_ERROR);
 				break;
 		}
 
-		$countries = $this->Conn->Query($sql);
-		$o = '';
+		$ret = '';
+		$states = $this->Conn->GetCol($sql, $id_field);
 
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
 
-		foreach($countries as $key => $country) {
-			$param['id'] = $country['DestId'];
-			$param['destination_title'] = $this->Application->Phrase($country['DestName']);
-			if (isset($selected_country) && $selected_country == $param['id']){
-				$param['selected'] = ' selected="selected"';
-			}
-			else {
-				$param['selected']='';
-			}
-			$o .= $this->Application->ParseBlock($param);
+		foreach($states as $state_id => $state_name) {
+			$block_params['id'] = $state_id;
+			$block_params['destination_title'] = $state_name;
+
+			$ret .= $this->Application->ParseBlock($block_params);
 		}
-		return $o;
 
+		return $ret;
 	}
 
-	function ShowStates($param)
+	function ShowZips($params)
 	{
-		$param = $this->prepareTagParams($param);
-		$param['name'] = $param['block'];
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		$destination 	= &$this->Application->recallObject('taxdst');
-		$zone 			= &$this->Application->recallObject('tax');
+		$destination_table = $this->getDestinationsTable($params);
 
-		switch ($param['show']){
-			case 'current':
-				$sql = 'SELECT *
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
+		$country_id = (int)$this->Application->GetVar('CountrySelector');
+
+		$current_sql = 'SELECT DestValue
+						FROM ' . $destination_table . '
 						WHERE
-							sd.DestType=2
-							AND sd.DestParentId='.$this->Application->GetVar('CountrySelector').'
-							AND zd.TaxZoneId='.$zone->GetDBField('TaxZoneId').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+							COALESCE(DestValue, "") <> "" AND
+							TaxZoneId = ' . $object->GetID() . '
+						ORDER BY DestValue';
+
+		switch ($params['show']) {
+			case 'current':
+				$sql = $current_sql;
 				break;
 
 			case 'available':
-				$sql = 'SELECT *
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
+				$selected_zips = $this->Conn->GetCol($current_sql);
+				$selected_zips = array_map(Array (&$this->Conn, 'qstr'), $selected_zips);
+
+				$sql = 'SELECT DISTINCT DestValue
+						FROM ' . $this->Application->getUnitOption('taxdst', 'TableName') . '
 						WHERE
-							sd.DestType=2
-							AND zd.TaxZoneId IS NULL
-							AND sd.DestParentId='.$this->Application->GetVar('CountrySelector').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+							COALESCE(DestValue, "") <> "" AND
+							TaxZoneId <> ' . $object->GetID() . ' AND
+							' . ($selected_zips ? 'DestValue NOT IN (' . implode(',', $selected_zips) . ') AND' : '') . '
+							StdDestId = ' . $country_id . '
+							ORDER BY DestValue';
 				break;
 
-			case 'all':
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 2 AND sd.DestParentId='.$this->Application->GetVar('CountrySelector').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+			default:
+				trigger_error('Unknown "show" parameter value "' . $params['show'] . '" used.', E_USER_ERROR);
 				break;
 		}
 
-		$states = $this->Conn->Query($sql);
-		$o = '';
-		foreach($states as $key => $state) {
-			$param['id'] = $state['DestId'];
-			$param['destination_title'] = $this->Application->Phrase($state['DestName']);
-			$o .= $this->Application->ParseBlock($param);
-		}
-		return $o;
+		$zips = $this->Conn->GetCol($sql);
 
-	}
+		$ret = '';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
 
-	function ShowZips($param){
+		foreach($zips as $zip) {
+			$block_params['id'] = '0|' . $zip;
+			$block_params['destination_title'] = $zip;
 
-		$param = $this->prepareTagParams($param);
-		$param['name'] = $param['block'];
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
 
-		$destination 	= &$this->Application->recallObject('taxdst');
-		$zone 			= &$this->Application->recallObject('tax');
+		return $ret;
+	}
 
-		$country_selector = $this->Application->GetVar('CountrySelector');
-		if (!$country_selector){
-			$country_selector=0;
-		}
+	/**
+	 * Returns table for shipping zone destinations
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function getDestinationsTable($params)
+	{
+		static $table_name = '';
 
-		switch ($param['show']){
-			case 'current':
-				$sql = 'SELECT * FROM '.$destination->TableName.'
-												WHERE NOT(DestValue IS NULL)
-												AND DestValue<>""
-												AND TaxZoneID='.$zone->GetDBField('TaxZoneId').'
-												ORDER BY DestValue
-												';
-				break;
-			case 'available':
-				$selected_zips = $this->Conn->GetCol('SELECT DestValue FROM '.$destination->TableName.'
-												WHERE NOT(DestValue IS NULL)
-												AND DestValue<>""
-												AND TaxZoneID='.$zone->GetDBField('TaxZoneId').'
-												ORDER BY DestValue
-												');
+		if (!$table_name) {
+			$object =& $this->getObject($params);
+			/* @var $object kDBItem */
 
-				$sql = 'SELECT DISTINCT(DestValue) FROM '.$this->Application->getUnitOption('taxdst', 'TableName').'
-												WHERE NOT(DestValue IS NULL)
-												AND TaxZoneID!='.$zone->GetDBField('TaxZoneId').'
-												AND DestValue NOT IN ("'.implode('", "', $selected_zips).'")
-												AND DestValue<>"" AND StdDestId='.$country_selector.'
-												ORDER BY DestValue
-												';
+			$table_name = $this->Application->getUnitOption('taxdst', 'TableName');
 
-				break;
-			case 'all':
-				$sql = 'SELECT sd.* FROM '.TABLE_PREFIX.'StdDestinations sd
-												WHERE sd.DestType=3 AND sd.DestParentId='.$country_selector.'
-												ORDER BY DestValue
-												';
-				break;
+			if ($object->IsTempTable()) {
+				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+			}
 		}
 
-		$zips = $this->Conn->Query($sql);
-		$o = '';
-		foreach($zips as $key => $zip) {
-			$param['id'] = $zip['DestId'].'|'.$zip['DestValue'];
-			$param['destination_title'] = $zip['DestValue'];
-			$o .= $this->Application->ParseBlock($param);
-		}
-		return $o;
-
+		return $table_name;
 	}
-
 }
\ No newline at end of file
Index: in-commerce/units/zones/zones_tag_processor.php
===================================================================
--- in-commerce/units/zones/zones_tag_processor.php	(revision 13329)
+++ in-commerce/units/zones/zones_tag_processor.php	(working copy)
@@ -15,446 +15,258 @@
 
 class ZonesTagProcessor extends kDBTagProcessor
 {
-	/*
-	function ShowDestinations($param)
+	function ShowCountries($params)
 	{
-		$zone =& $this->Application->recallObject('z');
-		$zone->SetDBField('ZoneID', $zone->ID);
-		$destination =& $this->Application->recallObject('dst');
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		if(!$this->Application->GetVar('loaded'))
-		{
-			if ($zone->GetID() == 0)
-			{
-				$this->Application->DeleteVar('dst');
-			}
-			else
-			{
-				$sql = 'SELECT * FROM '.$destination->TableName.' WHERE ShippingZoneId='.$zone->GetID();
-				$res = $this->Conn->Query($sql);
-				if (is_array($res)) foreach ($res as $dest_record)
-				{
-					$temp[$dest_record['ZoneDestId']]['ZoneDestId'] = $dest_record['ZoneDestId'];
-					$temp[$dest_record['ZoneDestId']]['StdDestId'] = $dest_record['StdDestId'];
-					$temp[$dest_record['ZoneDestId']]['DestValue'] = $dest_record['DestValue'];
-				}
-				$this->Application->SetVar('dst', $temp);
-			}
-		}
+		$destination_table = $this->getDestinationsTable($params);
+		$selected_country_id = (int)$this->Application->GetVar('CountrySelector');
 
-		$hidden_clause = '<input type="hidden" name="loaded" value="1"><input type="hidden" name="zone_id" value="'.$zone->GetDBField('ZoneID').'">';
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
 
-		switch ( $zone->GetDBField('Type') )
-		{
-			case 1:
+		switch ($params['show']) {
+			case 'current':
+				// selected countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.ShippingZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
+				break;
 
-				$sql = 'SELECT * FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1';
-				$res = $this->Conn->Query($sql, 'DestId');
-				$dropdown = '<select name="country">'."\n";
-				foreach ($res as $record)
-				{
-					$dropdown .= '<option value="'.$record['DestId'].'">'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-				}
-				$dropdown .= '</select>'."\n";
-
-				$form_params = Array();
-				$form_params['dropdown'] = $dropdown;
-				$form_params['block'] = $param['block'];
-				$form_params['res'] = $res;
-				$ret = $this->ShowDestionationForm($form_params);
-
+			case 'available':
+				// available countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.ShippingZoneId IS NULL
+						ORDER BY cs.' . $name_field;
 				break;
-			case 2:
 
-				$country_sql = 'SELECT d1.* FROM '.TABLE_PREFIX.'StdDestinations d1,
-								'.TABLE_PREFIX.'StdDestinations d2
-								WHERE d1.DestType=1 AND d1.DestId=d2.DestParentId
-								GROUP BY d1.DestId';
-				if( !($current_country = $this->Application->GetVar('StatesCountry')) )
-				{
-					$current_country_sql = 'SELECT sd.DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-												LEFT JOIN '.$destination->TableName.' zd
-												ON zd.StdDestId = sd.DestId
-												WHERE sd.DestType=2 AND zd.ShippingZoneId='.$zone->GetDBField('ZoneID');
-					if($zone->GetDBField('ZoneID'))
-					{
-						$current_country = $this->Conn->GetOne($current_country_sql);
-					}
+			case 'all':
+				// always preselect 1st country, when user haven't selected any
+				if (!$selected_country_id) {
+					$sql = 'SELECT StdDestId
+							FROM ' . $destination_table . '
+							WHERE ShippingZoneId = ' . $object->GetID();
+					$selected_country_id = $this->Conn->GetOne($sql);
 
-					if(!$current_country)
-					{
-						$current_country_sql = '	SELECT d1.DestId FROM '.TABLE_PREFIX.'StdDestinations d1
-													LEFT JOIN '.TABLE_PREFIX.'StdDestinations d2
-													ON d1.DestId = d2.DestParentId
-													WHERE d1.DestType=1
-													AND d2.DestId IS NOT NULL';
-						$current_country = $this->Conn->GetOne($current_country_sql);
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
 				}
-				$states_sql = 'SELECT * FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=2 AND DestParentId='.$current_country;
-				$countries = $this->Conn->Query($country_sql, 'DestId');
-				$states = $this->Conn->Query($states_sql, 'DestId');
 
-				if($countries)
-				{
-					$countries_dropdown = '<select name="StatesCountry" onchange="submit_event(\'z\', \'OnCountryChange\')">'."\n";
-					foreach ($countries as $record)
-					{
-						$countries_dropdown .= '<option value="'.$record['DestId'].'" ';
-						if($record['DestId'] == $current_country)
-						{
-							$countries_dropdown .= 'selected';
-						}
-						$countries_dropdown .= '>'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-					}
-					$countries_dropdown .= '</select>'."\n";
-				}
+				// all countries
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+						ORDER BY ' . $name_field;
+				break;
 
-				if($states)
-				{
-					$states_dropdown = '<select name="state">'."\n";
-					foreach ($states as $id => $record)
-					{
-						$states_dropdown .= '<option value="'.$record['DestId'].'">'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-					}
-					$states_dropdown .= '</select>'."\n";
-				}
+			case 'has_states':
+				$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+				/* @var $cs_helper kCountryStatesHelper */
 
-				$form_params = Array();
-				$table = '<table border="0"><tr><td>'.$this->Application->Phrase('la_fld_Country').': </td><td>'.$countries_dropdown.'</td></tr>';
-				$table .= '<tr><td>'.$this->Application->Phrase('la_fld_State').': </td><td>'.$states_dropdown.'</td></tr></table>';
-				$form_params['dropdown'] = $table;
-				$form_params['block'] = $param['block'];
-				$form_params['res'] = $states;
-				$ret = $this->ShowDestionationForm($form_params);
+				$has_states = $cs_helper->getCountriesWithStates();
 
-				break;
-			case 3:
-
-				$country_sql = 'SELECT * FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1';
-				if( !($current_country = $this->Application->GetVar('ZIPCountry')) )
-				{
-					$current_country_sql = 'SELECT StdDestId FROM '.$destination->TableName.'
-												WHERE ShippingZoneId='.$zone->GetDBField('ZoneID');
-					$cur_country = (int)$this->Conn->GetOne($current_country_sql);
-					if($zone->GetDBField('ZoneID') && $cur_country)
-					{
-						$current_country = $cur_country;
-					}
-					else
-					{
-						$current_country_sql = 'SELECT MIN(DestId) FROM '.TABLE_PREFIX.'StdDestinations';
-						$current_country = (int)$this->Conn->GetOne($current_country_sql);
-					}
+				if ($selected_country_id && !array_key_exists($selected_country_id, $has_states)) {
+					list ($selected_country_id, ) = each($has_states);
+					$this->Application->SetVar('CountrySelector', $selected_country_id);
 				}
-				$countries = $this->Conn->Query($country_sql, 'DestId');
 
-				if($countries)
-				{
-					$countries_dropdown = '<select name="ZIPCountry" onchange="submit_event(\'z\', \'OnCountryChange\')">'."\n";
-					foreach ($countries as $record)
-					{
-						$countries_dropdown .= '<option value="'.$record['DestId'].'" ';
-						if($record['DestId'] == $current_country)
-						{
-							$countries_dropdown .= 'selected';
-						}
-						$countries_dropdown .= '>'.$this->Application->Phrase($record['DestName']).'</option>'."\n";
-					}
-					$countries_dropdown .= '</select>'."\n";
-				}
+				// preselect country from 1st found state
+				if (!$selected_country_id) {
+					$sql = 'SELECT cs.StateCountryId
+							FROM ' . $table_name . ' cs
+							LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+							WHERE (cs.Type = ' . DESTINATION_TYPE_STATE . ') AND (zd.ShippingZoneId = ' . $object->GetID() . ')';
+					$selected_country_id = $this->Conn->GetOne($sql);
 
-
-				$sql = 'SELECT DestValue FROM '.TABLE_PREFIX.'ShippingZonesDestinations WHERE NOT(DestValue IS NULL) AND DestValue<>"" AND StdDestId='.$current_country;
-				$res = array_unique( $this->Conn->GetCol($sql) );
-				$dropdown = '<input type="text" name="zip_input" id="zip_input" size="15">';
-				if($res)
-				{
-					$dropdown .= ' or <select name="zip_dropdown">'."\n";
-					$dropdown .= '<option value=""></option>';
-					foreach ($res as $record)
-					{
-						$dropdown .= '<option value="'.$record.'">'.$record.'</option>'."\n";
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
 					}
-					$dropdown .= '</select>'."\n";
+					else {
+						list ($selected_country_id, ) = each($has_states);
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
 				}
 
-				$table = '<table border="0"><tr><td>'.$this->Application->Phrase('la_fld_Country').': </td><td>'.$countries_dropdown.'</td></tr>';
-				$table .= '<tr><td>'.$this->Application->Phrase('la_fld_ZIP').': </td><td>'.$dropdown.'</td></tr></table>';
-
-				$form_params = Array();
-				$form_params['dropdown'] = $table;
-				$form_params['block'] = $param['block'];
-				$form_params['res'] = $res;
-				$ret = $this->ShowDestionationForm($form_params);
-
+				// gets only countries with states
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' AND ' . $id_field . ' IN (' . implode(',', array_keys($has_states)) . ')
+						ORDER BY ' . $name_field;
 				break;
+
 			default:
+				trigger_error('Unknown "show" parameter value "' . $params['show'] . '" used.', E_USER_ERROR);
+				break;
 		}
 
-		$ret .= $hidden_clause;
-		return $ret;
-	}
+		$ret = '';
+		$countries = $this->Conn->GetCol($sql, $id_field);
 
-	function ShowDestionationForm($param)
-	{
-		$add_button = '<input type="button" class="button" value="'.$this->Application->Phrase('la_btn_AddLocation').'" onclick="submit_event(\'z\', \'OnAddLocation\')">';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
 
-		$main_processor =& $this->Application->RecallObject('m_TagProcessor');
-		$oddevenparam['odd'] = 'table-color1';
-		$oddevenparam['even'] = 'table-color2';
-		$ret = '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td></td><td>'.$param['dropdown'].'</td><td>'.$add_button.'</td></tr>';
+		foreach ($countries as $country_id => $country_name) {
+			$block_params['id'] = $country_id;
+			$block_params['destination_title'] = $country_name;
+			$block_params['selected'] = $selected_country_id == $country_id ? ' selected="selected"' : '';
 
-		$dest_list = $this->Application->GetVar('dst');
-		if (is_array($dest_list) && count($dest_list))
-		{
-			$ret .= '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td></td><td><select multiple name="location_list" onchange="SelectToString(this)">';
-			$hidden = '';
-
-			foreach ($dest_list as $id => $destination)
-			{
-				$params = $destination;
-				$params['id'] = $id;
-				$hidden .= '<input type="hidden" id="dst['.$destination['ZoneDestId'].'][ZoneDestId]" name="dst['.$destination['ZoneDestId'].'][ZoneDestId]" value="'.$destination['ZoneDestId'].'">';
-
-				$zones_object =& $this->Application->recallObject('z');
-
-				switch($zones_object->GetDBField('Type'))
-				{
-					case 1:
-						$params['destination_title'] = $this->Application->Phrase( $param['res'][$destination['StdDestId']]['DestName'] );
-						$hidden .= '<input type="hidden" id="dst['.$destination['ZoneDestId'].'][StdDestId]" name="dst['.$destination['ZoneDestId'].'][StdDestId]" value="'.$destination['StdDestId'].'">';
-						break;
-					case 2:
-						$params['destination_title'] = $this->Application->Phrase( $param['res'][$destination['StdDestId']]['DestName'] );
-						$hidden .= '<input type="hidden" id="dst['.$destination['ZoneDestId'].'][StdDestId]" name="dst['.$destination['ZoneDestId'].'][StdDestId]" value="'.$destination['StdDestId'].'">';
-						break;
-					case 3:
-						$params['destination_title'] = $destination['DestValue'];
-						$hidden .= '<input type="hidden" id="dst['.$destination['ZoneDestId'].'][DestValue]" name="dst['.$destination['ZoneDestId'].'][DestValue]" value="'.$destination['DestValue'].'">';
-
-				}
-
-				$params['name']	= $param['block'];
-				$ret .= $main_processor->ParseBlock($params);
-			}
-			$ret .= '</select></td><td><input type="button" class="button" value="'.$this->Application->Phrase('la_btn_RemoveLocations').'" onclick="remove_location('.$destination['ZoneDestId'].')"></td><tr>';
-			$ret .= $hidden;
+			$ret .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $ret;
 	}
-	*/
 
+	function ShowStates($params)
+	{
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-	function ShowCountries($param){
+		$destination_table = $this->getDestinationsTable($params);
 
-		$param = $this->prepareTagParams($param);
-		$param['name'] = $param['block'];
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
 
-		$destination 	= &$this->Application->recallObject('dst');
-		$zone 			= &$this->Application->recallObject('z');
+		$country_id = $this->Application->GetVar('CountrySelector');
 
-		$selected_country = Array(); // this prevents 241 warnings to me raised :D
-		switch ($param['show']){
+		switch ($params['show']) {
 			case 'current':
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1 AND zd.ShippingZoneId='.$zone->GetDBField('ZoneID').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+				// selected states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . ' AND
+							cs.StateCountryId = ' . $country_id . ' AND
+							zd.ShippingZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
 				break;
 
 			case 'available':
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1 AND zd.ShippingZoneId IS NULL
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+				// available states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . '
+							AND zd.ShippingZoneId IS NULL
+							AND cs.StateCountryId = ' . $country_id . '
+						ORDER BY cs.' . $name_field;
 				break;
 
 			case 'all':
-				$selected_country = $this->Application->GetVar('CountrySelector');
-				if (!$selected_country){
-					// get 1st available country ID
-					$selected_country = $this->Conn->GetOne('SELECT StdDestId FROM '.$destination->TableName.'
-								WHERE ShippingZoneId='.$zone->GetDBField('ZoneID'));
-					if ($selected_country){
-						$this->Application->SetVar('CountrySelector', $selected_country);
-					}
-				}
-
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+				// all possible states for selected country
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_STATE . ' AND StateCountryId = ' . $country_id . '
+						ORDER BY ' . $name_field;
 				break;
 
-			case 'has_states':
-				$has_states = $this->Conn->GetCol('SELECT DISTINCT DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-												WHERE sd.DestType=2');
-				$selected_country = $this->Application->GetVar('CountrySelector');
-
-				if ($selected_country && !in_array($selected_country, $has_states)){
-					$selected_country = $has_states[0];
-					$this->Application->SetVar('CountrySelector', $selected_country);
-				}
-
-				if (!$selected_country){
-					// get 1st available country ID
-					$selected_country = $this->Conn->GetOne('SELECT DestParentId FROM '.TABLE_PREFIX.'StdDestinations sd
-								LEFT JOIN '.$destination->TableName.' zd
-								ON zd.StdDestId = sd.DestId
-								WHERE sd.DestType=2
-								AND zd.ShippingZoneId='.$zone->GetDBField('ZoneID'));
-					if ($selected_country){
-						$this->Application->SetVar('CountrySelector', $selected_country);
-					}
-					else {
-						$selected_country = $has_states[0];
-						$this->Application->SetVar('CountrySelector', $selected_country);
-					}
-				}
-
-
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 1 AND DestId IN ('.implode(',', $has_states).')
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+			default:
+				trigger_error('Unknown "show" parameter value "' . $params['show'] . '" used.', E_USER_ERROR);
 				break;
 		}
 
-		$countries = $this->Conn->Query($sql);
-		$o = '';
+		$ret = '';
+		$states = $this->Conn->GetCol($sql, $id_field);
 
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
 
-		foreach($countries as $key => $country) {
-			$param['id'] = $country['DestId'];
-			$param['destination_title'] = $this->Application->Phrase($country['DestName']);
-			if ($selected_country && $selected_country == $param['id']){
-				$param['selected'] = ' selected="selected"';
-			}
-			else {
-				$param['selected']='';
-			}
-			$o .= $this->Application->ParseBlock($param);
+		foreach($states as $state_id => $state_name) {
+			$block_params['id'] = $state_id;
+			$block_params['destination_title'] = $state_name;
+
+			$ret .= $this->Application->ParseBlock($block_params);
 		}
-		return $o;
 
+		return $ret;
 	}
 
-	function ShowStates($param){
+	function ShowZips($params)
+	{
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		$param = $this->prepareTagParams($param);
-		$param['name'] = $param['block'];
+		$destination_table = $this->getDestinationsTable($params);
 
-		$destination 	= &$this->Application->recallObject('dst');
-		$zone 			= &$this->Application->recallObject('z');
+		$country_id = (int)$this->Application->GetVar('CountrySelector');
 
-		switch ($param['show']){
-			case 'current':
-				$sql = 'SELECT *
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
+		$current_sql = 'SELECT DestValue
+						FROM ' . $destination_table . '
 						WHERE
-							sd.DestType=2
-							AND sd.DestParentId='.$this->Application->GetVar('CountrySelector').'
-							AND zd.ShippingZoneId='.$zone->GetDBField('ZoneID').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+							COALESCE(DestValue, "") <> "" AND
+							ShippingZoneID = ' . $object->GetID() . '
+						ORDER BY DestValue';
+
+		switch ($params['show']) {
+			case 'current':
+				$sql = $current_sql;
 				break;
 
 			case 'available':
-				$sql = 'SELECT *
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.$destination->TableName.' zd ON zd.StdDestId = sd.DestId
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
+				$selected_zips = $this->Conn->GetCol($current_sql);
+				$selected_zips = array_map(Array (&$this->Conn, 'qstr'), $selected_zips);
+
+				$sql = 'SELECT DISTINCT DestValue
+						FROM ' . $this->Application->getUnitOption('dst', 'TableName') . '
 						WHERE
-							sd.DestType=2
-							AND zd.ShippingZoneId IS NULL
-							AND sd.DestParentId='.$this->Application->GetVar('CountrySelector').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+							COALESCE(DestValue, "") <> "" AND
+							ShippingZoneID <> ' . $object->GetID() . ' AND
+							' . ($selected_zips ? 'DestValue NOT IN (' . implode(',', $selected_zips) . ') AND' : '') . '
+							StdDestId = ' . $country_id . '
+							ORDER BY DestValue';
 				break;
 
-			case 'all':
-				$sql = 'SELECT sd.*
-						FROM '.TABLE_PREFIX.'StdDestinations sd
-						LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = sd.DestName
-						WHERE sd.DestType = 2 AND sd.DestParentId='.$this->Application->GetVar('CountrySelector').'
-						ORDER BY l' . $this->Application->GetVar('lang.current_id') . '_Translation';
+			default:
+				trigger_error('Unknown "show" parameter value "' . $params['show'] . '" used.', E_USER_ERROR);
 				break;
 		}
 
-		$states = $this->Conn->Query($sql);
-		$o = '';
-		foreach($states as $key => $state) {
-			$param['id'] = $state['DestId'];
-			$param['destination_title'] = $this->Application->Phrase($state['DestName']);
-			$o .= $this->Application->ParseBlock($param);
-		}
-		return $o;
+		$zips = $this->Conn->GetCol($sql);
 
-	}
+		$ret = '';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
 
-	function ShowZips($param){
+		foreach($zips as $zip) {
+			$block_params['id'] = '0|' . $zip;
+			$block_params['destination_title'] = $zip;
 
-		$param = $this->prepareTagParams($param);
-		$param['name'] = $param['block'];
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
 
-		$destination 	= &$this->Application->recallObject('dst');
-		$zone 			= &$this->Application->recallObject('z');
+		return $ret;
+	}
 
-		$country_selector = $this->Application->GetVar('CountrySelector');
-		if (!$country_selector){
-			$country_selector=0;
-		}
+	/**
+	 * Returns table for shipping zone destinations
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function getDestinationsTable($params)
+	{
+		static $table_name = '';
 
-		switch ($param['show']){
-			case 'current':
-				$sql = 'SELECT * FROM '.$destination->TableName.'
-												WHERE NOT(DestValue IS NULL)
-												AND DestValue<>""
-												AND ShippingZoneID='.$zone->GetDBField('ZoneID').'
-												ORDER BY DestValue
-												';
-				break;
-			case 'available':
-				$selected_zips = $this->Conn->GetCol('SELECT DestValue FROM '.$destination->TableName.'
-												WHERE NOT(DestValue IS NULL)
-												AND DestValue<>""
-												AND ShippingZoneID='.$zone->GetDBField('ZoneID').'
-												ORDER BY DestValue
-												');
+		if (!$table_name) {
+			$object =& $this->getObject($params);
+			/* @var $object kDBItem */
 
-				$sql = 'SELECT DISTINCT(DestValue) FROM '.$this->Application->getUnitOption('dst', 'TableName').'
-												WHERE NOT(DestValue IS NULL)
-												AND ShippingZoneID!='.$zone->GetDBField('ZoneID').'
-												AND DestValue NOT IN ("'.implode('", "', $selected_zips).'")
-												AND DestValue<>"" AND StdDestId='.$country_selector.'
-												ORDER BY DestValue
-												';
+			$table_name = $this->Application->getUnitOption('dst', 'TableName');
 
-				break;
-			case 'all':
-				$sql = 'SELECT sd.* FROM '.TABLE_PREFIX.'StdDestinations sd
-												WHERE sd.DestType=3 AND sd.DestParentId='.$country_selector.'
-												ORDER BY DestValue
-												';
-				break;
+			if ($object->IsTempTable()) {
+				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+			}
 		}
 
-		$zips = $this->Conn->Query($sql);
-		$o = '';
-		foreach($zips as $key => $zip) {
-			$param['id'] = $zip['DestId'].'|'.$zip['DestValue'];
-			$param['destination_title'] = $zip['DestValue'];
-			$o .= $this->Application->ParseBlock($param);
-		}
-		return $o;
-
+		return $table_name;
 	}
 }
\ No newline at end of file
Index: in-link/install/install_data.sql
===================================================================
--- in-link/install/install_data.sql	(revision 13329)
+++ in-link/install/install_data.sql	(working copy)
@@ -2,10 +2,10 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_Highlight_OpenTag', '<span class="match">', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_Highlight_CloseTag', '</span>', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_RatingToPop', '5', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
-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);
-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);
-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);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortOrder2', 'desc', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield2_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.02, 2, 1);
+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);
+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);
+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);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortOrder2', 'desc', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield2_prompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.02, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Links', '10', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_perpage_prompt', 'text', '', '', 10.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Links_Short', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_perpage_short_prompt', 'text', '', '', 10.04, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_NewDays', '100', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_newdays_prompt', 'text', '', '', 10.05, 0, 1);
@@ -17,18 +17,18 @@
 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);
 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);
 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);
-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);
+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);
 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);
-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);
+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);
 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);
 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);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_GoogleMapsAPIKey', '', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_LinkGoogleMapsAPIKey', 'text', NULL, NULL, 10.17, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableLinkContactForm', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_EnableLinkContactForm', 'checkbox', NULL, NULL, 10.18, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ReciprocalLinkChecking', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_ReciprocalLinkChecking', 'checkbox', NULL, NULL, 10.19, 0, 0);
-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);
-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);
-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);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsOrder2', 'asc', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.02, 2, 1);
+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);
+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);
+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);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsOrder2', 'asc', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.02, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_LinkReviews', '10', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_LinkReviews_Short', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.04, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_CategoryTemplate', '/in-link/designs/section', 'In-Link', 'in-link:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0);
@@ -107,8 +107,8 @@
 INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkAddress', 'lu_fld_LinkAddress', 0, 'la_section_BusinessLocation', 'la_fld_LinkAddress', 'text', 'size="40"', '', 1, 1, 0, 0);
 INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkCity', 'lu_fld_LinkCity', 0, 'la_section_BusinessLocation', 'la_fld_LinkCity', 'text', 'size="40"', '', 2, 1, 0, 0);
 INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkZipCode', 'lu_fld_LinkZipCode', 0, 'la_section_BusinessLocation', 'la_fld_LinkZipCode', 'text', NULL, '', 4, 1, 0, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkState', 'lu_fld_LinkState', 0, 'la_section_BusinessLocation', 'la_fld_LinkState', 'select', '=+||<SQL>SELECT DestAbbr AS OptionValue, DestName AS OptionName FROM <PREFIX>StdDestinations WHERE DestType = 2 AND (DestParentId = 225 OR DestParentId = 38) ORDER BY DestParentId DESC, DestAbbr ASC</SQL>', '', 3, 1, 0, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkCountry', 'lu_fld_LinkCountry', 0, 'la_section_BusinessLocation', 'la_fld_LinkCountry', 'select', '=+||<SQL>SELECT DestAbbr AS OptionValue, DestName AS OptionName FROM <PREFIX>StdDestinations WHERE DestType = 1 ORDER BY DestAbbr ASC</SQL>', '', 5, 1, 0, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkState', 'lu_fld_LinkState', 0, 'la_section_BusinessLocation', 'la_fld_LinkState', 'select', '=+||<SQL+>SELECT IsoCode AS OptionValue, l%3$s_Name AS OptionName FROM <PREFIX>CountryStates WHERE Type = 2 ORDER BY StateCountryId DESC, IsoCode ASC</SQL>', '', 3, 1, 0, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkCountry', 'lu_fld_LinkCountry', 0, 'la_section_BusinessLocation', 'la_fld_LinkCountry', 'select', '=+||<SQL+>SELECT IsoCode AS OptionValue, l%3$s_Name AS OptionName FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY IsoCode ASC</SQL>', '', 5, 1, 0, 0);
 INSERT INTO CustomField VALUES (DEFAULT, 4, 'LinkPhone', 'lu_fld_LinkPhone', 0, 'la_section_BusinessLocation', 'la_fld_LinkPhone', 'text', NULL, '', 6, 1, 0, 0);
 
 INSERT INTO ItemTypes VALUES (4, 'In-Link', 'l', 'Link', 'Name', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_Links', 1, 'in-link/admin/addlink.php', 'clsLink', 'Link');
Index: in-link/install/upgrades.sql
===================================================================
--- in-link/install/upgrades.sql	(revision 13329)
+++ in-link/install/upgrades.sql	(working copy)
@@ -66,3 +66,11 @@
 # ===== v 5.1.0-B1 =====
 UPDATE Modules SET Path = 'modules/in-link/' WHERE `Name` = 'In-Link';
 DELETE FROM ConfigurationValues WHERE VariableName IN ('StartValidationTime', 'LastExpirationTime', 'Link_Root');
+
+UPDATE CustomField
+SET ValueList = '=+||<SQL+>SELECT IsoCode AS OptionValue, l%3$s_Name AS OptionName FROM <PREFIX>CountryStates WHERE Type = 2 ORDER BY StateCountryId DESC, IsoCode ASC</SQL>'
+WHERE ValueList = '=+||<SQL>SELECT DestAbbr AS OptionValue, DestName AS OptionName FROM <PREFIX>StdDestinations WHERE DestType = 2 AND (DestParentId = 225 OR DestParentId = 38) ORDER BY DestParentId DESC, DestAbbr ASC</SQL>';
+
+UPDATE CustomField
+SET ValueList = '=+||<SQL+>SELECT IsoCode AS OptionValue, l%3$s_Name AS OptionName FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY IsoCode ASC</SQL>'
+WHERE ValueList = '=+||<SQL>SELECT DestAbbr AS OptionValue, DestName AS OptionName FROM <PREFIX>StdDestinations WHERE DestType = 1 ORDER BY DestAbbr ASC</SQL>';
\ No newline at end of file
Index: in-news/install/install_data.sql
===================================================================
--- in-news/install/install_data.sql	(revision 13329)
+++ in-news/install/install_data.sql	(working copy)
@@ -1,10 +1,10 @@
 # Section "in-news:configuration_output":
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_Highlight_OpenTag', '<span class="match">', 'In-News', 'in-news:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_Highlight_CloseTag', '</span>', 'In-News', 'in-news:configuration_output', '', '', '', NULL, NULL, 0, 0, 0);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortField', 'CreatedOn', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'Title=la_Article_Title,Excerpt=la_Article_Excerpt,Author=la_Article_Author,CreatedOn=la_Article_Date,Hits=la_Article_Hits,CachedRating=la_Article_Rating,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.01, 2, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortField2', 'Title', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'Title=la_Article_Title,Excerpt=la_Article_Excerpt,Author=la_Article_Author,CreatedOn=la_Article_Date,Hits=la_Article_Hits,CachedRating=la_Article_Rating,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortOrder2', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.02, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortField', 'CreatedOn', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'Title=la_Article_Title||Excerpt=la_Article_Excerpt||Author=la_Article_Author||CreatedOn=la_Article_Date||Hits=la_Article_Hits||CachedRating=la_Article_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.01, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortField2', 'Title', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'Title=la_Article_Title||Excerpt=la_Article_Excerpt||Author=la_Article_Author||CreatedOn=la_Article_Date||Hits=la_Article_Hits||CachedRating=la_Article_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortOrder2', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.02, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_News', '8', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_perpage_prompt', 'text', '', '', 10.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_News_Short', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_perpage_short_prompt', 'text', '', '', 10.04, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_CatNewDays', '5', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_newdays_prompt', 'text', '', '', 10.05, 0, 1);
@@ -13,15 +13,15 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_MaxHotNumber', '5', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_fld_News_MaxHotNumber', 'text', '', '', 10.08, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_Archive', '0', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_daysarchive_prompt', 'text', '', '', 10.09, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_ShowPick', '1', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_editorpicksabove_prompt', 'checkbox', '', '', 10.1, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_ReviewDelay_Interval', '3600', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', '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.11, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_ReviewDelay_Interval', '3600', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', '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.11, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_ReviewDelay_Value', '12', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.11, 1, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_RatingDelay_Value', '1', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.12, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_RatingDelay_Interval', '86400', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', '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.12, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_RatingDelay_Interval', '86400', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', '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.12, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_MaxCategories', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.13, 0, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviews', 'ReviewText', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn', 20.01, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviewsOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.01, 2, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviews2', 'ReviewText', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn', 20.02, 1, 1);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviewsOrder2', 'asc', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.02, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviews', 'ReviewText', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.01, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviewsOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.01, 2, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviews2', 'ReviewText', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.02, 1, 1);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortReviewsOrder2', 'asc', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.02, 2, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_NewsReviews_Short', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_NewsReviews', '10', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'n_CategoryTemplate', '/in-news/designs/section', 'In-News', 'in-news:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0);