diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
index 7d01276df8..fb6517460f 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
@@ -38,6 +38,34 @@ export default ['$scope', '$rootScope', '$location', '$log',
                 });
         }
 
+        $scope.$on(`${list.iterator}_options`, function(event, data){
+            $scope.options = data.data.actions.GET;
+            optionsRequestDataProcessing();
+        });
+
+        $scope.$watchCollection(`${$scope.list.name}`, function() {
+                optionsRequestDataProcessing();
+            }
+        );
+        // iterate over the list and add fields like type label, after the
+        // OPTIONS request returns, or the list is sorted/paginated/searched
+        function optionsRequestDataProcessing(){
+            $scope[list.name].forEach(function(item, item_idx) {
+                var itm = $scope[list.name][item_idx];
+
+                // Set the item type label
+                if (list.fields.type && $scope.options && $scope.options.hasOwnProperty('type')) {
+                    $scope.options.type.choices.every(function(choice) {
+                        if (choice[0] === item.type) {
+                            itm.type_label = choice[1];
+                            return false;
+                        }
+                        return true;
+                    });
+                }
+            });
+        }
+
         $scope.addJobTemplate = function() {
             $state.go('jobTemplates.add');
         };
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
index 63dbe37202..6205ae0ea8 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
@@ -66,6 +66,39 @@ export default ['$scope', '$rootScope', '$location', '$log',
             });
         }
 
+        $scope.$on(`${list.iterator}_options`, function(event, data){
+            $scope.options = data.data.actions.GET;
+            optionsRequestDataProcessing();
+        });
+
+        $scope.$watchCollection(`${$scope.list.name}`, function() {
+                optionsRequestDataProcessing();
+            }
+        );
+
+        // iterate over the list and add fields like type label, after the
+        // OPTIONS request returns, or the list is sorted/paginated/searched
+        function optionsRequestDataProcessing(){
+            $scope[list.name].forEach(function(item, item_idx) {
+                var itm = $scope[list.name][item_idx];
+
+                // Set the item type label
+                if (list.fields.scm_type && $scope.options &&
+                        $scope.options.hasOwnProperty('scm_type')) {
+                            $scope.options.scm_type.choices.every(function(choice) {
+                                if (choice[0] === item.scm_type) {
+                                itm.type_label = choice[1];
+                                return false;
+                            }
+                            return true;
+                        });
+                    }
+
+                    // buildTooltips(itm);
+
+            });
+        }
+
         // Go out and get the organization
         Rest.setUrl(orgBase + $stateParams.organization_id);
         Rest.get()
diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
index 64ad9dd8e7..b92cb03222 100644
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
@@ -298,6 +298,7 @@ export default [{
             list.searchSize = "col-lg-12 col-md-12 col-sm-12 col-xs-12";
             list.iterator = 'job_template';
             list.name = 'job_templates';
+            list.fields.type.ngBind = "job_template.type_label";
             return list;
         }],
         OrgJobTemplateDataset: ['OrgJobTemplateList', 'QuerySet', '$stateParams', 'GetBasePath',
diff --git a/awx/ui/client/src/smart-status/smart-status.controller.js b/awx/ui/client/src/smart-status/smart-status.controller.js
index 44a8e0d88c..10762de15d 100644
--- a/awx/ui/client/src/smart-status/smart-status.controller.js
+++ b/awx/ui/client/src/smart-status/smart-status.controller.js
@@ -15,6 +15,9 @@ export default ['$scope', '$filter',
             var singleJobStatus = true;
             var firstJobStatus;
             var recentJobs = $scope.jobs;
+            if(!recentJobs){
+                return;
+            }
             var sparkData =
             _.sortBy(recentJobs.map(function(job) {