diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 30b7413ec6..ad3cff4442 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -1668,6 +1668,10 @@ tr td button i {
   border: 1px solid @black;
 }
 
+.modal .SmartSearch-bar {
+    width: 100%;
+}
+
 #alert-modal, #alert-modal2 {
   z-index: 2100;
 }
diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js b/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js
index b9e03ba185..2f97505acd 100644
--- a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js
+++ b/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js
@@ -45,15 +45,16 @@ export default ['templateUrl', function(templateUrl) {
                         delete hostList.fields.toggleHost;
                         delete hostList.fields.active_failures;
                         delete hostList.fields.inventory;
+                        hostList.well = false;
                         let html = GenerateList.build({
                             list: hostList,
-                            input_type: 'foobar',
-                            mode: 'lookup'
+                            input_type: 'host-filter-modal-body',
+                            //mode: 'lookup'
                         });
 
                         $scope.list = hostList;
 
-                        $('#foobar').append($compile(html)($scope));
+                        $('#host-filter-modal-body').append($compile(html)($scope));
 
                         $scope.showModal();
                     });
diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html b/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html
index 3f5a33e48d..fd29edc1fc 100644
--- a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html
+++ b/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html
@@ -11,10 +11,10 @@
                     </button>
                 </div>
             </div>
-            <div class="modal-body" id="foobar"></div>
+            <div class="modal-body" id="host-filter-modal-body"></div>
             <div class="modal-footer">
                 <button type="button" ng-click="cancelForm()" class="Lookup-cancel btn btn-default">CANCEL</button>
-                <button type="button" ng-click="saveForm()" class="Lookup-save btn btn-primary">SAVE</button>
+                <button type="button" ng-click="saveForm()" ng-disabled="!searchTags || searchTags.length === 0" class="Lookup-save btn btn-primary">SAVE</button>
             </div>
         </div>
     </div>
diff --git a/awx/ui/client/src/job-results/host-event/host-event.controller.js b/awx/ui/client/src/job-results/host-event/host-event.controller.js
index 5ee6166179..825cb5e25a 100644
--- a/awx/ui/client/src/job-results/host-event/host-event.controller.js
+++ b/awx/ui/client/src/job-results/host-event/host-event.controller.js
@@ -41,7 +41,7 @@
             // Unbind the listener so it doesn't fire when we close the modal via navigation
             $('#HostEvent').off('hidden.bs.modal');
             $('#HostEvent').modal('hide');
-            $state.go('jobDetail');
+            $state.go('jobResult');
         };
 
         var init = function(){
diff --git a/awx/ui/client/src/job-results/host-event/host-event.route.js b/awx/ui/client/src/job-results/host-event/host-event.route.js
index 650a82bb25..bb456bad6c 100644
--- a/awx/ui/client/src/job-results/host-event/host-event.route.js
+++ b/awx/ui/client/src/job-results/host-event/host-event.route.js
@@ -12,6 +12,9 @@ var hostEventModal = {
     controller: 'HostEventController',
     templateUrl: templateUrl('job-results/host-event/host-event-modal'),
     'abstract': false,
+    ncyBreadcrumb: {
+        skip: true
+    },
     resolve: {
         hostEvent: ['jobResultsService', '$stateParams', function(jobResultsService, $stateParams) {
             return jobResultsService.getRelatedJobEvents($stateParams.id, {
@@ -34,21 +37,30 @@ var hostEventJson = {
     name: 'jobResult.host-event.json',
     url: '/json',
     controller: 'HostEventController',
-    templateUrl: templateUrl('job-results/host-event/host-event-codemirror')
+    templateUrl: templateUrl('job-results/host-event/host-event-codemirror'),
+    ncyBreadcrumb: {
+        skip: true
+    },
 };
 
 var hostEventStdout = {
     name: 'jobResult.host-event.stdout',
     url: '/stdout',
     controller: 'HostEventController',
-        templateUrl: templateUrl('job-results/host-event/host-event-stdout')
+    templateUrl: templateUrl('job-results/host-event/host-event-stdout'),
+    ncyBreadcrumb: {
+        skip: true
+    },
 };
 
 var hostEventStderr = {
     name: 'jobResult.host-event.stderr',
     url: '/stderr',
     controller: 'HostEventController',
-    templateUrl: templateUrl('job-results/host-event/host-event-stderr')
+    templateUrl: templateUrl('job-results/host-event/host-event-stderr'),
+    ncyBreadcrumb: {
+        skip: true
+    },
 };
 
 
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 29ab834d90..96f0457fae 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1095,10 +1095,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         if(!field.multiSelect && !field.disableChooseOption){
                             html += "<option value=\"\">";
                             // some languages use "Playbook" as a proper noun
-                            var chosen_item = field.label;
-                            if (i18n._("playbook") !== i18n._("Playbook")) {
-                                chosen_item = label.toLowerCase();
-                            }
+                            var chosen_item = (i18n._("playbook") !== i18n._("Playbook")) ? field.label.toLowerCase() : field.label;
                             // Add a custom default select 'value' (default text)
                             html += (field.defaultText) ? field.defaultText : i18n.sprintf(i18n._("Choose a %s"), chosen_item);
                             html += "</option>\n";
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index d9f2a1f9b2..a460ed7717 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -318,9 +318,6 @@ export default ['$compile', 'Attr', 'Icon',
                 if (options.mode === 'lookup') {
                     if (options.input_type === "radio") { //added by JT so that lookup forms can be either radio inputs or check box inputs
                         innerTable += `<td class="List-tableCell"> <input type="radio" ng-model="${list.iterator}.checked" ng-value="1" ng-false-value="0" name="check_${list.iterator}_{{${list.iterator}.id}}" ng-click="toggle_row(${list.iterator}.id)"></td>`;
-                    }
-                    else if (options.input_type === "foobar") {
-
                     }
                     else { // its assumed that options.input_type = checkbox
                         innerTable += "<td class=\"List-tableCell select-column List-staticColumn--smallStatus\"><input type=\"checkbox\" ng-model=\"" + list.iterator + ".checked\" name=\"check_{{" +
@@ -489,8 +486,8 @@ export default ['$compile', 'Attr', 'Icon',
 
                 if (list.multiSelect) {
                     html += buildSelectAll().prop('outerHTML');
-                } else if (options.mode === 'lookup' && options.input_type !== 'foobar') {
-                    html += "<th class=\"List-tableHeader  select-column List-staticColumn--smallStatus\"></th>";
+                } else if (options.mode === 'lookup') {
+                    html += "<th class=\"List-tableHeader select-column List-staticColumn--smallStatus\"></th>";
                 }
 
                 if (options.mode !== 'lookup'){