diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
index 531a949d7c..348b8d4c05 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
@@ -288,6 +288,9 @@ function loadDevices(searchType, searchParam) {
                     case 'REMOVED' :
                         html = '<span><i class="fw fw-delete icon-danger"></i> Removed</span>';
                         break;
+                    case 'UNREACHABLE' :
+                        html = '<span><i class="fw fw-warning icon-warning"></i> Unreachable</span>';
+                        break;
                 }
                 return html;
             }
@@ -461,11 +464,11 @@ function loadDevices(searchType, searchParam) {
             attachDeviceEvents();
 
 
-            // if ($('.advance-search').length < 1) {
-            //     $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input')
-            //         .after('<a href="' + context + '/devices/search"' +
-            //             ' class="advance-search add-padding-3x">Advance Search</a>');
-            // }
+            if ($('.advance-search').length < 1) {
+                $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input')
+                    .after('<a href="' + context + '/devices/search"' +
+                        ' class="advance-search add-padding-3x">Advance Search</a>');
+            }
 
         }, {
             "placeholder": "Search By Device Name",