diff --git a/ansibleworks/ui/static/js/helpers/search.js b/ansibleworks/ui/static/js/helpers/search.js
index d701592253..4b2842627f 100644
--- a/ansibleworks/ui/static/js/helpers/search.js
+++ b/ansibleworks/ui/static/js/helpers/search.js
@@ -100,14 +100,15 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
            if ( (scope[iterator + 'SelectShow'] == false && scope[iterator + 'SearchValue'] != '' && scope[iterator + 'SearchValue'] != undefined) ||
                 (scope[iterator + 'SelectShow'] && scope[iterator + 'SearchSelectValue']) || 
                 (list.fields[scope[iterator + 'SearchField']].searchType && list.fields[scope[iterator + 'SearchField']].searchType == 'gtzero') ) {
-              if (list.fields[scope[iterator + 'SearchField']].sourceModel) {
+              
+              if (list.fields[scope[iterator + 'SearchField']].searchField) {
+                 scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].searchField + '__'; 
+              }
+              else if (list.fields[scope[iterator + 'SearchField']].sourceModel) {
                  // handle fields whose source is a related model e.g. inventories.organization
                  scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].sourceModel + '__' + 
                  list.fields[scope[iterator + 'SearchField']].sourceField + '__';
               }
-              else if (list.fields[scope[iterator + 'SearchField']].searchField) {
-                 scope[iterator + 'SearchParams'] = '?' + list.fields[scope[iterator + 'SearchField']].searchField + '__'; 
-              }
               else {
                  scope[iterator + 'SearchParams'] = '?' + scope[iterator + 'SearchField'] + '__'; 
               }
diff --git a/ansibleworks/ui/static/js/lists/JobEvents.js b/ansibleworks/ui/static/js/lists/JobEvents.js
index 5f19a21c1c..490bd1a137 100644
--- a/ansibleworks/ui/static/js/lists/JobEvents.js
+++ b/ansibleworks/ui/static/js/lists/JobEvents.js
@@ -35,7 +35,8 @@ angular.module('JobEventsListDefinition', [])
                 ngClick: "viewHost(\{\{ jobevent.host \}\})",
                 ngBind: 'jobevent.host_name',
                 sourceModel: 'host',
-                sourceField: 'name'
+                sourceField: 'name',
+                searchField: 'hosts__name'
                 },
             status: {
                 label: 'Status',