Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r16404 -r16415
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16404)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16415)
@@ -698,22 +698,19 @@
 			</inp2:m_if>
 
 			<script type="text/javascript">
-				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>'
+				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>';
 
-				new AJAXDropDown(
-					'<inp2:$prefix_InputName name="$field" js_escape="1"/>',
-					function(cur_value) {
-						var $type = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val();
+				$( jq('#<inp2:$prefix_InputName name="$field" js_escape="1"/>') ).autocomplete({
+					source: function( request, response ) {
+						request['type'] = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val();
 
-						if ( !isNaN( parseInt($type) ) ) {
-							var $url = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddress" value="#VALUE#" type="#TYPE#" no_amp="1" js_escape="1"/>';
-
-							return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type));
-						}
-
-						return false;
+						$.getJSON(
+							'<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddressJSON" no_amp="1" js_escape="1"/>',
+							request,
+							response
+						);
 					}
-				);
+				});
 
 				$(document).ready(
 					function () {