diff --git a/app/components/edit-projecttemplate/component.js b/app/components/edit-projecttemplate/component.js
index 853810b9d..f7a85bbc3 100644
--- a/app/components/edit-projecttemplate/component.js
+++ b/app/components/edit-projecttemplate/component.js
@@ -236,6 +236,7 @@ export default Ember.Component.extend(NewOrEdit, {
     Object.keys(map).forEach((key) => {
       let obj = map[key];
       if ( obj && obj.enabled ) {
+        Ember.set(obj,'stack.externalId', C.EXTERNAL_ID.KIND_CATALOG + C.EXTERNAL_ID.KIND_SEPARATOR + obj.tplVersion.id);
         ary.push(obj.stack);
       }
     });
diff --git a/app/components/host-pod/component.js b/app/components/host-pod/component.js
index eb4eb2584..9c40b5a7f 100644
--- a/app/components/host-pod/component.js
+++ b/app/components/host-pod/component.js
@@ -29,11 +29,8 @@ export default Ember.Component.extend(ManageLabels, GroupedInstances, {
   filteredInstances: function() {
     let out = this.get('model.instances')||[];
 
-    if ( this.get('show') !== 'all' ) {
-      out = out.filter((inst) => {
-        let labels = inst.get('labels');
-        return !labels || !labels[C.LABEL.SYSTEM_TYPE];
-      });
+    if ( this.get('show') === 'standard' ) {
+      out = out.filterBy('isSystem', false);
     }
 
     return out;
diff --git a/app/models/instance.js b/app/models/instance.js
index 93ba47ecc..ae725a512 100644
--- a/app/models/instance.js
+++ b/app/models/instance.js
@@ -1,3 +1,13 @@
 import Resource from 'ember-api-store/models/resource';
+import C from 'ui/utils/constants';
 
-export default Resource.extend();
+export default Resource.extend({
+  isSystem: function() {
+    if ( this.get('system') ) {
+      return true;
+    }
+
+    let labels = this.get('labels');
+    return labels && !!labels[C.LABEL.SYSTEM_TYPE];
+  }.property('system','labels'),
+});