diff --git a/lib/shared/addon/catalog/service.js b/lib/shared/addon/catalog/service.js
index 32335ac42..34aaced37 100644
--- a/lib/shared/addon/catalog/service.js
+++ b/lib/shared/addon/catalog/service.js
@@ -75,7 +75,9 @@ export default Service.extend({
     apps.forEach((app) => {
       let extInfo = parseHelmExternalId(app.get('externalId'));
 
-      deps.push(this.fetchTemplate(extInfo.templateId, false));
+      if ( extInfo && extInfo.templateId ) {
+        deps.push(this.fetchTemplate(extInfo.templateId, false));
+      }
     });
 
     return allSettled(deps);
diff --git a/lib/shared/addon/components/schema/input-boolean/component.js b/lib/shared/addon/components/schema/input-boolean/component.js
index fe2122d1f..844e786a0 100644
--- a/lib/shared/addon/components/schema/input-boolean/component.js
+++ b/lib/shared/addon/components/schema/input-boolean/component.js
@@ -1,14 +1,17 @@
 import Component from '@ember/component';
+import { next } from '@ember/runloop';
 import layout from './template';
 
 export default Component.extend({
   layout,
 
   didReceiveAttrs() {
-    if ( this.get('value') === 'false' ) {
-      this.set('value', false);
-    } else if ( this.get('value') === 'true' ) {
-      this.set('value', true);
-    }
+    next(() => {
+      if ( this.get('value') === 'true' ) {
+        this.set('value', true);
+      } else if ( this.get('value') === 'false' ) {
+        this.set('value', false);
+      }
+    });
   }
 });
diff --git a/lib/shared/addon/components/schema/input-enum/template.hbs b/lib/shared/addon/components/schema/input-enum/template.hbs
index ab3fcec8d..b92950e6b 100644
--- a/lib/shared/addon/components/schema/input-enum/template.hbs
+++ b/lib/shared/addon/components/schema/input-enum/template.hbs
@@ -1,11 +1,11 @@
 <select name="" class="form-control mb-10" onChange={{action (mut value) value="target.value"}}>
   <option value="">{{t 'schema.inputEnum.option'}}</option>
-  {{#each field.options as |option|}}
-    <option value={{option}} selected={{eq option value}}>
-      {{#if (eq option 'LoadBalancer')}}
+  {{#each field.options as |choice|}}
+    <option value={{choice}} selected={{eq choice value}}>
+      {{#if (eq choice 'LoadBalancer')}}
         {{t 'model.service.displayKind.loadBalancer'}}
       {{else}}
-        {{option}}
+        {{choice}}
       {{/if}}
     </option>
   {{/each}}