Index: branches/5.1.x/admin_templates/shipping/zone_edit.tpl
===================================================================
diff -u -r13100 -r13465
--- branches/5.1.x/admin_templates/shipping/zone_edit.tpl	(.../zone_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/zone_edit.tpl	(.../zone_edit.tpl)	(revision 13465)
@@ -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;