diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
index 44b2f1be4..9efc1e713 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
@@ -112,17 +112,17 @@ public class PrefillingMapper {
                 throw e;
             }
         } else {
-            List<JsonNode> nodes = JsonSearcher.findNodes(parentNode, "rdaProperty", prefillingMapping.getMaDmpTarget());
+            List<JsonNode> nodes = JsonSearcher.findNodes(parentNode, "schematics", "rda." + prefillingMapping.getMaDmpTarget());
 
             // zenodo prefilling customizations
             if(type.equals("zenodo")){
                 if(prefillingMapping.getMaDmpTarget().equals("dataset.distribution.data_access")){
                     if(parsedValue != null && parsedValue.equals("open")){
-                        List<JsonNode> issuedNodes = JsonSearcher.findNodes(parentNode, "rdaProperty", "dataset.issued");
+                        List<JsonNode> issuedNodes = JsonSearcher.findNodes(parentNode, "schematics", "rda.dataset.issued");
                         if(!issuedNodes.isEmpty()){
                             String issuedIdNode = issuedNodes.get(0).get("id").asText();
                             String issuedValue = (String) properties.get(issuedIdNode);
-                            List<JsonNode> licStartDateNodes = JsonSearcher.findNodes(parentNode, "rdaProperty", "dataset.distribution.license.start_date");
+                            List<JsonNode> licStartDateNodes = JsonSearcher.findNodes(parentNode, "schematics", "rda.dataset.distribution.license.start_date");
                             for (JsonNode licStartDateNode : licStartDateNodes) {
                                 String licStartDateId = licStartDateNode.get(0) != null ? licStartDateNode.get(0).get("id").asText() : licStartDateNode.get("id").asText();
                                 properties.put(licStartDateId, issuedValue);