1 files changed, 9 insertions, 6 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
index 858d15ab9e..fbc451dd11 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
@@ -124,12 +124,7 @@ public class UiComponentDataConverter {
                 setComponentInstanceInputs(dataTransfer, component);
                 break;
             case NODE_FILTER:
-                if(component.getNodeFilterComponents() == null) {
-                    dataTransfer.setNodeFilterData(null);
-                } else {
-                    NodeFilterConverter nodeFilterConverter = new NodeFilterConverter();
-                    dataTransfer.setNodeFilterData(nodeFilterConverter.convertDataMapToUI(component.getNodeFilterComponents()));
-                }
+                setNodeFilter(dataTransfer, component);
                 break;
             case COMPONENT_INSTANCES_INTERFACES:
                 setComponentInstanceInterfaces(dataTransfer, component);
@@ -145,6 +140,14 @@ public class UiComponentDataConverter {
         }
     }
 
+    private void setNodeFilter(UiComponentDataTransfer dataTransfer, Component component) {
+        if(component.getNodeFilterComponents() == null) {
+          dataTransfer.setNodeFilter(null);
+        } else {
+          dataTransfer.setNodeFilter(component.getNodeFilterComponents());
+        }
+    }
+
     private void setPolicies(UiComponentDataTransfer dataTransfer, Component component) {
         Map<String, PolicyDefinition> policies = component.getPolicies();
         Set<PolicyDefinition> policyDefinitions =