diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index c70e5221..602d3c6e 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -11,7 +11,7 @@
 }
 
 .stf-device-list .clear-filtering-buttons {
-  margin-top: 0px;
+  margin-top: 0;
 }
 
 .stf-device-list .device-not-usable {
@@ -40,7 +40,7 @@
 }
 
 .stf-device-list .device-search {
-  width: 10em;
+  width: 20em;
   -webkit-transition: none;
   transition: none;
 }
@@ -50,7 +50,7 @@
 }
 
 .stf-device-list .device-search:focus {
-  width: 25em;
+  /*width: 25em;*/
 }
 
 ul.devices-icon-view {
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index eb16ac25..2fdf85eb 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -16,7 +16,7 @@
                 .filtering-buttons
                   input(type='search', results='5', autosave='deviceFilter'
                     name='deviceFilter', ng-model='deviceFilter', ng-change='applyFilter(deviceFilter)',
-                    ng-model-options='{debounce: 250}'
+                    ng-model-options='{debounce: 150}'
                     autocorrect='off', autocapitalize='off', spellcheck='false').form-control.input-sm.device-search.pull-right
                 .clear-filtering-buttons
 
@@ -28,10 +28,15 @@
                 span(translate) Details
               div.device-list-details-content(ng-if='activeTabs.details')
                 .filtering-buttons
+                  datalist(id='searchFields')
+                    select(name='searchFields')
+                      option(ng-repeat='column in columns', ng-value='column.name + ": "', ng-bind='columnDefinitions[column.name].title | translate')
+
                   input(type='search', results='5', autosave='deviceFilter'
                     name='deviceFilter', ng-model='deviceFilter', ng-change='applyFilter(deviceFilter)',
-                    ng-model-options='{debounce: 250}'
-                    autocorrect='off', autocapitalize='off', spellcheck='false').form-control.input-sm.device-search.pull-right
+                    ng-model-options='{debounce: 150}'
+                    autocorrect='off', autocapitalize='off', spellcheck='false'
+                    list='searchFields', multiple).form-control.input-sm.device-search.pull-right
 
                   span.pull-right
                     .btn-group(dropdown).pull-right