diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index bbd78e6b3a93066d81d63058cd96917726b9453e..f76a7cc86392a0db92652f11223f071d833739ab 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -57,6 +57,8 @@ tab_change_warning=n
 use_loadindicator=y
 use_combobox=y
 show_support_messages=y
+use_ipsuggestions=y
+ipsuggestions_max=50
 maintenance_mode=n
 maintenance_mode_exclude_ips=
 admin_dashlets_left=
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index 4d4c011fb5e5e4b06bed617601bd7bac42f345d8..803be62d5f882f12a20b8d6e4516bb693a0f8184 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -186,11 +186,26 @@ class functions {
 		}
 	}
 
+	/**
+	 * Function to suggest IP addresses in selectbox with hints, limited to the client logged in.
+	 *
+	 * @access public
+	 * @param string $type (default: 'IPv4')
+	 * @return void
+	 */
 	public function suggest_ips($type = 'IPv4'){
 		global $app;
 
+		$use_suggestions = $app->getconf->get_global_config('misc')['use_ipsuggestions'] == 'n' ? false : true;
+		if(!$use_suggestions) {return array('cheader' => array(), 'cdata' => array());}
+
+		$suggestions_max = $app->getconf->get_global_config('misc')['ipsuggestions_max'];
+		$groupid = intval($_SESSION["s"]["user"]["default_group"]);
+
+		// todo: order search results intelligently
+		// todo: read "context" from uri and search accordingly
+
 		if($type == 'IPv4'){
-//			$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
 			$regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
 		} else {
 			// IPv6
@@ -202,58 +217,74 @@ class functions {
 		$servers = $app->db->queryAllRecords("SELECT * FROM server");
 		if(is_array($servers) && !empty($servers)){
 			foreach($servers as $server){
-				$server_by_id[$server['server_id']] = $server['server_name'];
+				$server_by_id[$server['server_id']] = '<span class="ip_suggestion_server">server: ' . $server['server_name'] . '</span>';
 			}
 		}
 
+		$localips = array();
 		$ips = array();
 		$results = $app->db->queryAllRecords("SELECT ip_address AS ip, server_id FROM server_ip WHERE ip_type = ?", $type);
 		if(!empty($results) && is_array($results)){
 			foreach($results as $result){
 				if(preg_match($regex, $result['ip'])){
-					$ips[] = $result['ip'];
+					$localips[] = $result['ip'];
 					$server_by_ip[$result['ip']] = $server_by_id[$result['server_id']];
 				}
 			}
 		}
+
 		$results = $app->db->queryAllRecords("SELECT ip_address AS ip FROM openvz_ip");
 		if(!empty($results) && is_array($results)){
 			foreach($results as $result){
 				if(preg_match($regex, $result['ip'])) $ips[] = $result['ip'];
 			}
 		}
-		$results = $app->db->queryAllRecords("SELECT data AS ip FROM dns_rr WHERE type = 'A' OR type = 'AAAA'");
+
+		$results = $groupid != 1 ? $app->db->queryAllRecords("SELECT rr.data AS server_ip, rr.name as server_name, soa.origin as domain FROM dns_rr as rr, dns_soa as soa WHERE (rr.type = 'A' OR rr.type = 'AAAA') AND soa.id = rr.zone AND rr.sys_groupid = ?", $groupid) : $results = $app->db->queryAllRecords("SELECT rr.data AS server_ip, rr.name as server_name, soa.origin as domain FROM dns_rr as rr, dns_soa as soa WHERE (rr.type = 'A' OR rr.type = 'AAAA') AND soa.id = rr.zone");
 		if(!empty($results) && is_array($results)){
 			foreach($results as $result){
-				if(preg_match($regex, $result['ip'])) $ips[] = $result['ip'];
+				$result['server_name'] = substr($result['server_name'], -1) == '.' ? $result['server_name'] : $result['server_name'] . '.' . $result['domain'];
+				if (!array_key_exists($result['server_ip'],$server_by_ip)) {
+					$server_by_ip[$result['server_ip']] = 'dns: ' . $result['server_name'];
+					if(preg_match($regex, $result['server_ip'])) $ips[] = $result['server_ip'];
+				}
 			}
 		}
-		$results = $app->db->queryAllRecords("SELECT ns AS ip FROM dns_slave");
+
+		$results = $groupid != 1 ? $app->db->queryAllRecords("SELECT ns AS ip FROM dns_slave WHERE sys_groupid = ?", $groupid) : $results = $app->db->queryAllRecords("SELECT ns AS ip FROM dns_slave");
 		if(!empty($results) && is_array($results)){
 			foreach($results as $result){
-				if(preg_match($regex, $result['ip'])) $ips[] = $result['ip'];
+				if (!array_key_exists($result['ip'],$server_by_ip)) {
+					if(preg_match($regex, $result['ip'])) $ips[] = $result['ip'];
+				}
 			}
 		}
 
-		$results = $app->db->queryAllRecords("SELECT remote_ips FROM web_database WHERE remote_ips != ''");
+		$results = $groupid != 1 ? $app->db->queryAllRecords("SELECT database_name as name,remote_ips as ip FROM web_database WHERE remote_ips != '' AND sys_groupid = ?", $groupid) : $results = $app->db->queryAllRecords("SELECT database_name as name,remote_ips as ip FROM web_database WHERE remote_ips != ''");
 		if(!empty($results) && is_array($results)){
 			foreach($results as $result){
-				$tmp_ips = explode(',', $result['remote_ips']);
+				$tmp_ips = explode(',', $result['ip']);
 				foreach($tmp_ips as $tmp_ip){
 					$tmp_ip = trim($tmp_ip);
-					if(preg_match($regex, $tmp_ip)) $ips[] = $tmp_ip;
+					if (!array_key_exists($tmp_ip,$server_by_ip)) {
+						$server_by_ip[$tmp_ip] = 'database: ' . $result['name'];
+						if(preg_match($regex, $tmp_ip)) $ips[] = $tmp_ip;
+					}
 				}
 			}
 		}
 		$ips = array_unique($ips);
+		sort($localips, SORT_NUMERIC);
 		sort($ips, SORT_NUMERIC);
+		$ips = array_merge($localips,$ips);
+		$ips = array_slice($ips, 0, $suggestions_max);
 
 		$result_array = array('cheader' => array(), 'cdata' => array());
 
 		if(!empty($ips)){
 			$result_array['cheader'] = array('title' => 'IPs',
 				'total' => count($ips),
-				'limit' => count($ips)
+				'limit' => count($ips),
 			);
 
 			foreach($ips as $ip){
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index bbfb921e9a34b6a1969531bf72a8f084ba53c794..c48ebd41b8ac282b769235b703e072aa8bdfcc6a 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -637,6 +637,20 @@ $form["tabs"]['misc'] = array (
 			'default' => 'y',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
+		'use_ipsuggestions' => array (
+                        'datatype' => 'VARCHAR',
+                        'formtype' => 'CHECKBOX',
+                        'default' => 'y',
+                        'value'  => array(0 => 'n', 1 => 'y')
+                ),
+		'ipsuggestions_max' => array (
+                        'datatype' => 'INTEGER',
+                        'formtype' => 'TEXT',
+                        'default' => '50',
+                        'value'  => '',
+                        'width'  => '30',
+                        'maxlength' => '255'
+                ),
 		'maintenance_mode' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index 7d3df7fbf8ab5092e5ba3f71efa63886fdfb120e..515f3ce7a8c925df4f997f15e81c703a0faba00a 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index f99465e1b643ec04e87776d2dece87988cd79bf0..23b5d1fdeb2ff6953b86bf93c50f10f699967583 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index 58ffca080b4501f155f92e9f9e066210d6e82443..abcafab6b86ba2d50401a2ee4923d12250c7d7e8 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -104,3 +104,6 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
 $wb['monitor_key_txt'] = 'Senha do Monitor';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng
index d8bc0e2d48a435b69b1db7584d7e53601491ddf9..e286504acd3efecc294fbdb571492dea4ff0c3f5 100644
--- a/interface/web/admin/lib/lang/ca_system_config.lng
+++ b/interface/web/admin/lib/lang/ca_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 7db312097c3348cf9fa47ed2a908a526c9471d69..07f74d739c7a685320f1660b5fb847d04030e5dc 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -97,6 +97,9 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktivní';
 $wb['btn_save_txt'] = 'Uložit';
 $wb['btn_cancel_txt'] = 'Zrušit';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 4a862a2d4adb5960dca5a816db659b773e563c55..99de96b33beab4d8197ffcb03a49607a76a203f0 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktiv';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Nur Apache)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng
index eb96004421481829f5d4ae3d2e3b9c8568ec0637..5bc359d99667befeba068e968bc5e68a5e266d4e 100644
--- a/interface/web/admin/lib/lang/dk_system_config.lng
+++ b/interface/web/admin/lib/lang/dk_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index 68e10e37fcf941463c9c7a63ff15bedd32b7e491..ffcf5be89fb0a53c1813732e73afcebfc3658596 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index 4493913fb0f04904205a6e5019b4c5a1be59e24f..66a998679e8edf3bb8bafe06e9cdd2af90976b4f 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -101,10 +101,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Active';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index a001999dd4bcf7e403b7c43a6df079b4adfd91e9..9c581eeb060737444f03221e3ed061b35c25c3a2 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index eb7863fd5354b7724cf608aaa263fe242c961037..b2647a04121575a4235789868f07ed3957b6b836 100644
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index cfecf8e27f2cee39f5fd75d70762c86785b07d1a..9cc2965aba6ddeb5470a40542a06804763c0c1b8 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 3f6486ae53d5900412642455491ee4bb49391c35..da87058859d16f18da77306291c80bb96de526d8 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index 6b1a29ee46db9396a3abfaad4aee1347efb45350..1d2eea91b1c252516057e740434e69e7deee7191 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index f034f9bd769befcdab9a80144f86838f7ed27363..06075f56cd3a32910aff78f2ae747b7d9b9ed423 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index 42f878a54dfb2124c0eddea733b90718255b62e7..554d5452469135b4bc3af794f73a29c01e15e151 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index f50ffb511456d8897e4decb0543ab681d98b644b..f9d501e2ac56b3c963fdcc582c10e6e516eba693 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 4078be986ee76ddc553afeb1384cdc6871469895..c1e3614b4fd92caeed10d4b411c0468c7f589235 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'IP adres suggesties inschakelen';
+$wb['use_ipsuggestions_descr_txt'] = 'Toont een dropdown box met een lijst van IP adressen voor IPv4 en IPv6 adressen.';
+$wb['ipsuggestions_max_txt'] = 'Max aantal IP suggesties';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index c94313bdcbc4e5682957fd1493f7f8457a5927df..819092ed51a23739ea64cd47798ac7c976505e80 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index 39e4dc93f235ae9ddc8139bf4eada0152b6c7cac..3844a8fd2f37d4b9bbf1cb6ce1ca970f198275f6 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index 2b819a013ecca8ac102195e7f21cdfc5f0906a6d..25f508a0b32224537619fe2b76804e15904d01a9 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index 3aee07ff2ed7c958ef07e36f98650743e6a5ee77..fc83f5855b15e21e95d7a30102a176f5e7b3aa81 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index d075f875097ad66a94ab5e0069f457abc303d5fd..247a35a384dca3cfe33f905d806875da714073eb 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index ef4cc3fef932e498a3b92ab2cbfd01245a15ef98..96491e70d6f6445f2cb6a29fd45d45bae5b70f73 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Aktive';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index 3bb9c82b0adc6f1eedd8420943fb451c0338ac72..6ab500bd60f2f0765d8a6146e13d5b9c07828769 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -100,10 +100,12 @@ $wb['ca_iodef_txt'] = 'iodef';
 $wb['active_txt'] = 'Active';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
+$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown';
+$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.';
+$wb['ipsuggestions_max_txt'] = 'Max IP suggestions';
 $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
 $wb['client_protection_txt'] = 'Client protection';
 $wb['show_support_messages_txt'] = 'Show message function in help module';
 $wb['show_aps_menu_txt'] = 'Show APS menu';
 $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
 $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
-?>
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index 5c57eeb9a668fcdcfffa93dffaef4a406552a641..9c4e5fdb22adf22c407b30afb41f59e7085321d7 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -90,6 +90,16 @@
     {tmpl_var name='show_support_messages'}
   </div>
 </div>
+<div class="form-group">
+  <label class="col-sm-3 control-label">{tmpl_var name='use_ipsuggestions_txt'}</label>
+  <div class="col-sm-9">
+    {tmpl_var name='use_ipsuggestions'}<br/>{tmpl_var name='use_ipsuggestions_descr_txt'}
+  </div>
+</div>
+<div class="form-group">
+  <label for="ipsuggestions_max" class="col-sm-3 control-label">{tmpl_var name='ipsuggestions_max_txt'}</label>
+  <div class="col-sm-9"><input type="text" name="ipsuggestions_max" id="ipsuggestions_max" value="{tmpl_var name='ipsuggestions_max'}" class="form-control" /></div>
+</div>
 <div class="form-group">
   <label for="customer_no_template" class="col-sm-3 control-label">{tmpl_var name='customer_no_template_txt'}</label>
   <div class="col-sm-9"><input type="text" name="customer_no_template" id="customer_no_template" value="{tmpl_var name='customer_no_template'}" class="form-control" /></div>
diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm
index 592999de7e84bb72741ce6f32b94ee08376dc67e..09637cc6eeeb141d6c124117bbe1fd60b8a31088 100644
--- a/interface/web/dns/templates/dns_a_edit.htm
+++ b/interface/web/dns/templates/dns_a_edit.htm
@@ -26,11 +26,12 @@
         </div></div>
 <script language="JavaScript" type="text/javascript">
     jQuery('#data').ispconfigSearch({
-        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4&context=dns_a',
         resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
         ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
         noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        noResultsLimit: '',
+        displayNoResults: true,
         minChars: 0,
         cssPrefix: 'df-',
         fillSearchField: true,
diff --git a/interface/web/dns/templates/dns_aaaa_edit.htm b/interface/web/dns/templates/dns_aaaa_edit.htm
index d21d2bdd92685b457b286836c2db2c75012f50d4..810057370c93854b993b16b7c57c14271c4c2d82 100644
--- a/interface/web/dns/templates/dns_aaaa_edit.htm
+++ b/interface/web/dns/templates/dns_aaaa_edit.htm
@@ -26,11 +26,11 @@
         </div></div>
 <script language="JavaScript" type="text/javascript">
     jQuery('#data').ispconfigSearch({
-        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6&context=dns_aaaa',
         resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
         ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
         noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        noResultsLimit: '',
         minChars: 0,
         cssPrefix: 'df-',
         fillSearchField: true,
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm
index 1f4f7234d613d00c21291ae3292ca6108d15d9cd..7418696db3fbc9f26233ba224da425c6133d35ab 100644
--- a/interface/web/dns/templates/dns_slave_edit.htm
+++ b/interface/web/dns/templates/dns_slave_edit.htm
@@ -48,13 +48,13 @@
             <div class="form-group">
                 <label for="ns" class="col-sm-3 control-label">{tmpl_var name='ns_txt'}</label>
                 <div class="col-sm-9">
-					<input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" />
+					<input type="search" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" autocomplete="off" />
 					<p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
 				</div>
             </div>
             <div class="form-group">
                 <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="xfer" id="xfer" value="{tmpl_var name='xfer'}" class="form-control" /></div></div>
+                <div class="col-sm-9"><input type="search" name="xfer" id="xfer" value="{tmpl_var name='xfer'}" class="form-control" autocomplete="off" /></div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
@@ -72,11 +72,11 @@
         </div></div>
 <script language="JavaScript" type="text/javascript">
     jQuery('#ns').ispconfigSearch({
-        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4&context=dns_slave_ns',
         resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
         ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
         noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        noResultsLimit: '',
         minChars: 0,
         cssPrefix: 'df-',
         fillSearchField: true,
@@ -85,11 +85,11 @@
         resultBoxPosition: ''
     });
     jQuery('#xfer').ispconfigSearch({
-        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4&context=dns_slave_xfer',
         resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
         ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
         noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        noResultsLimit: '',
         minChars: 0,
         cssPrefix: 'df-',
         fillSearchField: true,
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index 97f338503099d330097583b225db61a0de55c195..4de110c4208e687651a983d5ea42e7f8c314a714 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -180,11 +180,11 @@
 </div>
 <script language="JavaScript" type="text/javascript">
   jQuery('#xfer').ispconfigSearch({
-    dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+    dataSrc: '/dns/ajax_get_json.php?type=get_ipv4&context=dns_soa_xfer',
     resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
     ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
     noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-    noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+    noResultsLimit: '',
     minChars: 0,
     cssPrefix: 'df-',
     fillSearchField: true,
@@ -193,11 +193,11 @@
     resultBoxPosition: ''
   });
   jQuery('#also_notify').ispconfigSearch({
-    dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+    dataSrc: '/dns/ajax_get_json.php?type=get_ipv4&context=dns_soa_also_notify',
     resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
     ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
     noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-    noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+    noResultsLimit: '',
     minChars: 0,
     cssPrefix: 'df-',
     fillSearchField: true,
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 07d064c1619ff850d9328dc748e8307237b38e39..72982edc7dd0e99d77c38820349eeca913c9fbbf 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -76,13 +76,13 @@
 		<tmpl_if name="IP_VISIBLE">
 			<div class="form-group">
 				<label for="ip" class="col-sm-3 control-label">{tmpl_var name='ip_txt'}</label>
-				<div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" /></div>
+				<div class="col-sm-9"><input type="search" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" autocomplete="off" /></div>
 			</div>
 		</tmpl_if>
 		<tmpl_if name="IPV6_VISIBLE">
 			<div class="form-group">
 				<label for="ipv6" class="col-sm-3 control-label">{tmpl_var name='ipv6_txt'}</label>
-				<div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" /></div>
+				<div class="col-sm-9"><input type="search" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" autocomplete="off" /></div>
 			</div>
 		</tmpl_if>
 		<tmpl_if name="NS1_VISIBLE">
@@ -129,11 +129,10 @@
 </div>
 <script language="JavaScript" type="text/javascript">
 	jQuery('#ip').ispconfigSearch({
-		dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+		dataSrc: '/dns/ajax_get_json.php?type=get_ipv4&context=dns_wizard_ip',
 		resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
 		ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
-		noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-		noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+		displayNoResults: false,
 		minChars: 0,
 		cssPrefix: 'df-',
 		fillSearchField: true,
@@ -144,11 +143,10 @@
 </script>
 <script language="JavaScript" type="text/javascript">
 	jQuery('#ipv6').ispconfigSearch({
-		dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
+		dataSrc: '/dns/ajax_get_json.php?type=get_ipv6&context=dns_wizard_ipv6',
 		resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
 		ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
-		noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-		noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+		displayNoResults: false,
 		minChars: 0,
 		cssPrefix: 'df-',
 		fillSearchField: true,
diff --git a/interface/web/js/jquery.ispconfigsearch.js b/interface/web/js/jquery.ispconfigsearch.js
index 1256860967cd34e4948a9e74948016807c3baa90..1c19c12ee89342166b851fc48b2e80fe6682a313 100644
--- a/interface/web/js/jquery.ispconfigsearch.js
+++ b/interface/web/js/jquery.ispconfigsearch.js
@@ -43,6 +43,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			noResultsLimit: '0 results',
 			searchFieldWatermark: 'Search',
 			displayEmptyCategories: false,
+			displayNoResults: true,
 			runJS: true
 		};
 		
@@ -129,16 +130,18 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 								}
 
 								//resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'right' : '0'}).fadeIn();
-								if(settings.resultBoxPosition == 'n'){
-									resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top-resultBox.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn();
-								} else if(settings.resultBoxPosition == 'e'){
-									resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left+searchField.outerWidth()}).fadeIn();
-								} else if(settings.resultBoxPosition == 's'){
-									resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn();
-								} else if(settings.resultBoxPosition == 'w'){
-									resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left-resultBox.outerWidth()}).fadeIn();
-								} else {
-									resultBox.html(output).fadeIn();
+								if (settings.displayNoResults){
+									if(settings.resultBoxPosition == 'n'){
+										resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top-resultBox.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn();
+									} else if(settings.resultBoxPosition == 'e'){
+										resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left+searchField.outerWidth()}).fadeIn();
+									} else if(settings.resultBoxPosition == 's'){
+										resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn();
+									} else if(settings.resultBoxPosition == 'w'){
+										resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left-resultBox.outerWidth()}).fadeIn();
+									} else {
+										resultBox.html(output).fadeIn();
+									}
 								}
 
 								searchField.removeClass(settings.cssPrefix+'loading');
@@ -173,4 +176,4 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		clearTimeout(timeout);
 		timeout = null;
 	};
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng
index 28d4e1fbdb54dda6f25412f0030f60c113a60ed7..4c66bc29ea4e4563753a37cf4b21c604bb46e8e9 100644
--- a/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Last month';
 $wb['this_year_txt'] = 'This year';
 $wb['last_year_txt'] = 'Last year';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng b/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng
index 28d4e1fbdb54dda6f25412f0030f60c113a60ed7..4c66bc29ea4e4563753a37cf4b21c604bb46e8e9 100644
--- a/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Last month';
 $wb['this_year_txt'] = 'This year';
 $wb['last_year_txt'] = 'Last year';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
index 382e75f68d399785740aa977517d026b59cfe582..a10c1222a8f29baa786a5f3f70ddf7fd0303fefe 100644
--- a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng
@@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Último mês';
 $wb['this_year_txt'] = 'Este ano';
 $wb['last_year_txt'] = 'Último ano';
 $wb['sum_txt'] = 'Soma';
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng
index 553fa01e51107e5cf684c94d348bb06604936d6a..f7b14e367db4de9a4d16ab6c033d9e9af0968ea3 100644
--- a/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Le mois précédent';
 $wb['this_year_txt'] = 'L\'année en cours';
 $wb['last_year_txt'] = 'L\'année précédente';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index 7f1812ba347f67e7bf3f6d9045962f5ffcf8809c..c710efe322b116bfa9aa1bb586146a41e820817a 100644
--- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
@@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Minulý měsíc';
 $wb['this_year_txt'] = 'Tento rok';
 $wb['last_year_txt'] = 'Minulý rok';
 $wb['sum_txt'] = 'Součet';
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
index c834793ce116e091ef256d56ecbc29f7001cbc19..edea20e6ae7dffe2227c85439e0cd0a115ad8d41 100644
--- a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Vergangener Monat';
 $wb['this_year_txt'] = 'Aktuelles Jahr';
 $wb['last_year_txt'] = 'Vergangenes Jahr';
 $wb['sum_txt'] = 'Summe';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng b/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng
index 7d5e6c0dbb89e40b39347986df8900d13a3f567d..7114dd96b58e624bae7b6b8bfb37ec5d10a1d866 100644
--- a/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Forrige måned';
 $wb['this_year_txt'] = 'Dette år';
 $wb['last_year_txt'] = 'Forrige år';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
index 9916646017e94839e1e27d6e193a5c55ca71f1a2..ee0b9db81def7f47762a18513fdb3ab079d07ded 100644
--- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Το τελευταίο μήνα';
 $wb['this_year_txt'] = 'Αυτό το χρόνο';
 $wb['last_year_txt'] = 'Τον τελευταίο χρόνο';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/es_web_sites_stats_list.lng b/interface/web/sites/lib/lang/es_web_sites_stats_list.lng
index f952a8258db5e8d64dfff97cae1ce9363c0bdcb6..0977007c1fddca909091c6c116ddfbdda4f2abcf 100644
--- a/interface/web/sites/lib/lang/es_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/es_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Último mes';
 $wb['this_year_txt'] = 'Este año';
 $wb['last_year_txt'] = 'Último año';
 $wb['sum_txt'] = 'Resumen';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng
index d8b0eb377ac3412e978332679acbff0c53969c73..5f60db510f23724935d7aa154356d1a25fb097c3 100644
--- a/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Viime kuussa';
 $wb['this_year_txt'] = 'Tänä vuonna';
 $wb['last_year_txt'] = 'Viime vuonna';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng
index 09d5e16570d662ffb5722bc55411caba01bdb95c..77494457fe39636c578faf0b00a71bf1e50d41bd 100644
--- a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Le mois précédent';
 $wb['this_year_txt'] = 'L’année en cours';
 $wb['last_year_txt'] = 'L’année précédente';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
index a89fc20e1071859523a2e4e4dea7b41845d11a9a..9aa7180c9fe6533ac7353870e9997fa5ae18c3c2 100644
--- a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Prošli mjesec';
 $wb['this_year_txt'] = 'Ovu godinu';
 $wb['last_year_txt'] = 'Prošlu godinu';
 $wb['sum_txt'] = 'Ukupno';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng
index 99c5c0a53190a5375453f61cf3aa1232193e3411..7b6e74fe92ec3d1ea60b57c73d85f0e428a0b5f7 100644
--- a/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Előző hónapban';
 $wb['this_year_txt'] = 'Ebben az évben';
 $wb['last_year_txt'] = 'Előző évben';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng
index 8fcf2bd62f992e7e63a6303c46f2e85b1fd7ec95..50e480c7f898088b5feff627a880ed71630eaa9e 100644
--- a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Sebulan terakhir';
 $wb['this_year_txt'] = 'Tahun ini';
 $wb['last_year_txt'] = 'Setahun terakhir';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
index e2eb5d0deb22ff8f8a8d2c24ef77e70a7493f7f5..dbb11076594aac7f8a03da2460e294f1570cae73 100644
--- a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Mese precedente';
 $wb['this_year_txt'] = 'Anno in corso';
 $wb['last_year_txt'] = 'Anno precedente';
 $wb['sum_txt'] = 'Somma';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng
index f0fc5fcfb1420847030861955146019ce4048a18..89695e011cc533b1f9ae2e5f7c6fc5c53224646c 100644
--- a/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = '先月';
 $wb['this_year_txt'] = '今年';
 $wb['last_year_txt'] = '去年';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
index fa5568418c2765c7b1bcac6a2dc3dc0921b1059b..910ed2d538d5b6729b0ab48edb480aed87c685d8 100644
--- a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng
@@ -8,4 +8,3 @@ $wb['last_year_txt'] = 'Vorig jaar';
 $wb['sum_txt'] = 'Som';
 $wb['percentage_txt'] = 'In gebruik %';
 $wb['quota_txt'] = 'Quota';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
index 29985f02f04a0cdd549d43c18f15335c3bae7f25..21043a7dfc268fc1b62929334cc8a11fe86fadbb 100644
--- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Ostatni miesiąc';
 $wb['this_year_txt'] = 'Ten rok';
 $wb['last_year_txt'] = 'Ostatni rok';
 $wb['sum_txt'] = 'Razem';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng
index acc22859be549c6cae62c6c2abbbcbb316df78aa..c4c61028763b910b86c770d2a7b5271446553a7e 100644
--- a/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Último mês';
 $wb['this_year_txt'] = 'Este ano';
 $wb['last_year_txt'] = 'Último ano';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng
index 28d4e1fbdb54dda6f25412f0030f60c113a60ed7..4c66bc29ea4e4563753a37cf4b21c604bb46e8e9 100644
--- a/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Last month';
 $wb['this_year_txt'] = 'This year';
 $wb['last_year_txt'] = 'Last year';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
index 84aa99119e39e7ba28a30cdc9f91fa8ea4362cf2..a941727ef78629fd2dfb6be7fc19d183a4fb51eb 100644
--- a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Последний месяц';
 $wb['this_year_txt'] = 'Этот год';
 $wb['last_year_txt'] = 'Последний год';
 $wb['sum_txt'] = 'Итого';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
index 95a82568edb2b08d8e31bdb1de356aa10acf68b2..d1e5c01b3e4b06b5f3320048aa33ba7ae18ff908 100644
--- a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Föregående månad';
 $wb['this_year_txt'] = 'I år';
 $wb['last_year_txt'] = 'Förra året';
 $wb['sum_txt'] = 'Total';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng b/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng
index 80f9585a080284b46a6a4f7b1b50e3f2c5b2363b..0f1a7d56efbfd571d45b43ccd2ee3bb43ca75426 100644
--- a/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Minulý mesiac';
 $wb['this_year_txt'] = 'Tento rok';
 $wb['last_year_txt'] = 'Minulý rok';
 $wb['sum_txt'] = 'Sum';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng
index 685fc22fc69af8a5fb4d2565ebf622dd5ec88d0c..0819dfc35fe7a948ed2c6adb992365a8ce5c8176 100644
--- a/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng
@@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Geçen ay';
 $wb['this_year_txt'] = 'Bu yıl';
 $wb['last_year_txt'] = 'Geçen yıl';
 $wb['sum_txt'] = 'Toplam';
-?>
+$wb['percentage_txt'] = 'In use %';
+$wb['quota_txt'] = 'Quota';
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index b4ed450f308f78c20b1f4051c73cfd5b6cd617ae..b7fc3ae2b9a1f1a245fe68305313c4e64138ecfe 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -137,11 +137,10 @@
     reloadDatabaseUsers();
     </tmpl_if>
     jQuery('#remote_ips').ispconfigSearch({
-        dataSrc: '/sites/ajax_get_json.php?type=get_ipv4',
+        dataSrc: '/sites/ajax_get_json.php?type=get_ipv4&context=database_remote_ips',
         resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
         ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
-        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        displayNoResults: false,
         minChars: 0,
         cssPrefix: 'df-',
         fillSearchField: true,
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 9d44048e82843cf8fbe5b4fd36e8c2adf9d06adc..2796bd16b9aab853254e3d346cbabb575462b556 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -836,3 +836,6 @@ span.tmp_account_name {
 #apache_directives, #nginx_directives, #proxy_directives {
 	font-family: Consolas, "Courier New", Courier, monospace;
 }
+.ip_suggestion_server {
+	font-weight: bold;
+}
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index b3630f6ecf451a84786655c9cac242f052c60946..6f4a78f69f417da31faf2c1ad3340b384b16a09d 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -149,7 +149,7 @@
 			dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
 			resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
 			noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-			noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+			noResultsLimit: '',
 			searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">',
 			resultBoxPosition: ''
 		});