diff --git a/app/tools/search/search_results/search-results_addresses.php b/app/tools/search/search_results/search-results_addresses.php
index 585936f06f91b24d4d136ef1b4ea43cabe1b4987..c35ff737aaf6d639d9a46455a55be20c4d7c7082 100755
--- a/app/tools/search/search_results/search-results_addresses.php
+++ b/app/tools/search/search_results/search-results_addresses.php
@@ -116,16 +116,17 @@ if(sizeof($result_addresses) > 0) {
 			}
 			//device
 			if(in_array('switch', $selected_ip_fields) && $User->get_module_permissions ("devices")>=User::ACCESS_R) {
-				if(!is_blank($line['switch']) && $line['switch']!="0") {
-					# get switch
-					$switch = (array) $Tools->fetch_object("devices", "id", $line['switch']);
-					$line['switch'] = $switch['hostname'];
-				}
-				else {
-					$line['switch'] = "/";
+				# get device details
+				$device = $Tools->fetch_object("devices", "id", $line['switch']);
+				if (is_object($device)) {
+					$rack = "";
+					if ($User->settings->enableRACK == "1" && $User->get_module_permissions("racks") >= User::ACCESS_R && $device->rack > 0) {
+						$rack = "<i class='btn btn-default btn-xs fa fa-server showRackPopup' data-rackid='" . $device->rack . "' data-deviceid='" . $device->id . "'></i>";
+					}
+					print "<td class='hidden-xs hidden-sm hidden-md'>$rack<a href='" . create_link("tools", "devices", $device->id) . "'>" . escape_input($device->hostname) . "</a></td>";
+				} else {
+					print "<td class='hidden-xs hidden-sm hidden-md'></td>";
 				}
-
-				print ' <td class="hidden-sm hidden-xs">'. $line['switch']  .'</td>' . "\n";
 			}
 			//port
 			if(in_array('port', $selected_ip_fields)) 										{ print ' <td>'. $line['port']  .'</td>' . "\n"; }