1 files changed, 5 insertions, 3 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
index 8b0ef75e43..225a068aaf 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
@@ -902,10 +902,12 @@ public class ModelConverter {
     }
 
     private static void convertSubstitutionFiltersComponents(final TopologyTemplate topologyTemplate, final Component component) {
-        final Map<String, SubstitutionFilterDataDefinition> filters = topologyTemplate.getSubstitutionFilterDataDefinitionMap();
-        if (MapUtils.isNotEmpty(filters)) {
-            component.setSubstitutionFilter(filters.get(component.getUniqueId()));
+        final SubstitutionFilterDataDefinition filters = topologyTemplate.getSubstitutionFilters();
+        if (filters == null){
+            component.setSubstitutionFilter(null);
+            return;
         }
+        component.setSubstitutionFilter(new SubstitutionFilterDataDefinition(filters));
     }
 
     private static void convertServiceApiArtifacts(TopologyTemplate topologyTemplate, Service service) {