diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js
index c42ff8c1e6..30658404ba 100644
--- a/awx/ui/client/src/lists/ScheduledJobs.js
+++ b/awx/ui/client/src/lists/ScheduledJobs.js
@@ -45,14 +45,17 @@ export default
                 sourceModel: 'unified_job_template',
                 sourceField: 'unified_job_type',
                 ngBind: 'schedule.type_label',
-                searchField: 'unified_job_template__name',
-                searchLable: 'Type',
+                searchField: 'unified_job_template__polymorphic_ctype__model',
+                filterBySearchField: true,
+                searchLabel: 'Type',
                 searchable: true,
                 searchType: 'select',
                 searchOptions: [
-                    { value: 'inventory source', label: 'Inventory Sync' },
-                    { value: 'job template', label: 'Playbook Run' },
-                    { value: 'project', label: 'SCM Update' }
+                    { value: 'inventorysource', label: 'Inventory Sync' },
+                    { value: 'jobtemplate', label: 'Playbook Run' },
+                    { value: 'project', label: 'SCM Update' },
+                    { value: 'systemjobtemplate', label: 'Management Job'}
+
                 ]
             },
             next_run: {
diff --git a/awx/ui/client/src/search/tagSearch.service.js b/awx/ui/client/src/search/tagSearch.service.js
index 777c4c6441..6b02b8fdf8 100644
--- a/awx/ui/client/src/search/tagSearch.service.js
+++ b/awx/ui/client/src/search/tagSearch.service.js
@@ -6,7 +6,10 @@ export default ['Rest', '$q', 'GetBasePath', 'Wait', 'ProcessErrors', '$log', fu
         var obj = {};
         // build the value (key)
         var value;
-        if (field.sourceModel && field.sourceField) {
+        if (field.searchField && field.filterBySearchField === true){
+            value = field.searchField;
+        }
+        else if (field.sourceModel && field.sourceField) {
             value = field.sourceModel + '__' + field.sourceField;
             obj.related = true;
         } else if (typeof(field.key) === String) {