Index: branches/5.3.x/core/admin_templates/config/config_edit.tpl
===================================================================
diff -u -N -r15974 -r15988
--- branches/5.3.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 15974)
+++ branches/5.3.x/core/admin_templates/config/config_edit.tpl	(.../config_edit.tpl)	(revision 15988)
@@ -80,19 +80,19 @@
 
 <script type="text/javascript">
 	$(document).ready(function () {
-		var $field_mask = '<inp2:conf_InputName name="#FIELD_NAME#" js_escape="1"/>',
-			$suggest_url = '<inp2:m_Link template="dummy" pass="m,conf" conf_event="OnSuggestValues" field="#FIELD_NAME#" cur_value="#CUR_VALUE#" no_amp="1" js_escape="1"/>';
+		var $suggest_url = '<inp2:m_Link template="dummy" pass="m,conf" conf_event="OnSuggestValuesJSON" field="#FIELD_NAME#" no_amp="1" js_escape="1"/>';
 
-		new AJAXDropDown($field_mask.replace('#FIELD_NAME#', 'Section'), function(cur_value) {
-			return $suggest_url.replace('#FIELD_NAME#', 'Section').replace('#CUR_VALUE#', encodeURIComponent(cur_value));
-		}, function(item) {
-			return item.getAttribute('value');
-		});
+		$.each(['Section', 'Heading'], function ($i, $field) {
+			var $selector = '<inp2:conf_InputName name="#FIELD_NAME#" js_escape="1"/>'.replace('#FIELD_NAME#', $field);
 
-		new AJAXDropDown($field_mask.replace('#FIELD_NAME#', 'Heading'), function(cur_value) {
-			return $suggest_url.replace('#FIELD_NAME#', 'Heading').replace('#CUR_VALUE#', encodeURIComponent(cur_value));
-		}, function(item) {
-			return item.getAttribute('value');
+			$('#' + jq($selector))
+			.autocomplete({
+				source: $suggest_url.replace('#FIELD_NAME#', $field)
+			})
+			.data('ui-autocomplete')._renderItem = function (ul, item) {
+				// allow HTML in items
+				return $('<li>').append($('<a>').html(item.label)).appendTo(ul);
+			};
 		});
 	});
 </script>