diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js
index 7be064e056..91a44053b0 100644
--- a/awx/ui/client/features/output/details.component.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -559,7 +559,7 @@ function getInstanceGroupDetails () {
     let link = `/#/instance_groups/${instanceGroup.id}`;
     if (instanceGroup.is_containerized) {
         label = strings.get('labels.CONTAINER_GROUP');
-        link = `/#/instance_groups/container_group/edit/${instanceGroup.id}`;
+        link = `/#/instance_groups/container_group/${instanceGroup.id}`;
     }
 
     let isolated = null;
diff --git a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
index 5f8064b9d6..29cca584f9 100644
--- a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
+++ b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
@@ -92,7 +92,7 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
   const podSpecValue = sanitizeVars(EditContainerGroupDataset.data.pod_spec_override);
   const defaultPodSpecValue = sanitizeVars(instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default);
 
-  if (podSpecValue && podSpecValue.trim() !== defaultPodSpecValue.trim()) {
+  if ((podSpecValue !== '---') && podSpecValue && podSpecValue.trim() !== defaultPodSpecValue.trim()) {
     vm.form.extraVars.isOpen = true;
   } else {
     vm.form.extraVars.isOpen = false;
diff --git a/awx/ui/client/src/instance-groups/main.js b/awx/ui/client/src/instance-groups/main.js
index 5c6d5d9886..1c0d80bbf7 100644
--- a/awx/ui/client/src/instance-groups/main.js
+++ b/awx/ui/client/src/instance-groups/main.js
@@ -199,6 +199,7 @@ function InstanceGroupsRun($stateExtender, strings) {
         params: {
             credential_search: {
                 value: {
+                    credential_type__kind: 'kubernetes',
                     order_by: 'name',
                     page_size: 5,
                 },
@@ -228,12 +229,11 @@ function InstanceGroupsRun($stateExtender, strings) {
         resolve: {
             ListDefinition: ['CredentialList', list => list],
             Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => {
-                const params = {
-                    credential_type__kind: 'kubernetes',
-                };
+
+
                 const searchPath = GetBasePath('credentials');
                 return qs.search(
-                    searchPath, params,
+                    searchPath,
                     $stateParams[`${list.iterator}_search`]
                 );
             }]
@@ -257,6 +257,7 @@ function InstanceGroupsRun($stateExtender, strings) {
                 controllerAs: 'vm'
             }
         },
+
         resolve: {
             resolvedModels: InstanceGroupsResolve,
             EditContainerGroupDataset: ['GetBasePath', 'QuerySet', '$stateParams',
@@ -278,6 +279,7 @@ function InstanceGroupsRun($stateExtender, strings) {
         params: {
             credential_search: {
                 value: {
+                    credential_type__kind: 'kubernetes',
                     order_by: 'name',
                     page_size: 5,
                 },
@@ -304,12 +306,9 @@ function InstanceGroupsRun($stateExtender, strings) {
         resolve: {
             ListDefinition: ['CredentialList', list => list],
             Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => {
-                const params = {
-                    credential_type__kind: 'kubernetes',
-                };
                 const searchPath = GetBasePath('credentials');
                 return qs.search(
-                    searchPath, params,
+                    searchPath,
                     $stateParams[`${list.iterator}_search`]
                 );
             }]