diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
index 1ad2d666f..cf4e6da80 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
@@ -344,7 +344,16 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
                 Method setterMethod = Arrays.stream(DatasetWizardModel.class.getDeclaredMethods())
                         .filter(method -> method.getName().equals(methodName)).collect(Collectors.toList()).get(0);
                 Class<?>[] params = setterMethod.getParameterTypes();
-                setterMethod.invoke(datasetWizardModel, new ObjectMapper().readValue(value, params[0]));
+                ObjectMapper mapper = new ObjectMapper();
+                //GK: Tags Special logic
+                if (prefillingMapping.getTarget().equals("tags")) {
+                    List<Object> rawTags = (List<Object>) mapper.readValue(value, params[0]);
+                    if (rawTags.get(0) instanceof String) {
+                        List<Tag> parsedTags = rawTags.stream().map(rawTag -> new Tag((String) rawTag, (String) rawTag)).collect(Collectors.toList());
+                        value = mapper.writeValueAsString(parsedTags);
+                    }
+                }
+                setterMethod.invoke(datasetWizardModel, mapper.readValue(value, params[0]));
             }catch (InvocationTargetException | IllegalAccessException | JsonProcessingException e) {
                 throw e;
             }
diff --git a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
index 770948fb9..7d055d3de 100644
--- a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
+++ b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
@@ -1033,10 +1033,17 @@
                     <mapping source="metadata.title" target="label" />
                     <mapping source="metadata.description" target="description" />
                     <mapping source="metadata.license.id" maDmpTarget="dataset.distribution.license.license_ref" />
+                    <mapping source="metadata.keywords" target="tags"/>
+                    <mapping source="metadata.filesize" maDmpTarget="dataset.distribution.byte_size"/>
+                    <mapping source="metadata.language" maDmpTarget="dataset.metadata.language"/>
+                    <mapping source="metadata.dates.valid" maDmpTarget="dataset.distribution.available_until"/>
+                    <mapping source="metadata.access_right" maDmpTarget="dataset.distribution.data_access"/>
+                    <mapping source="metadata.publication_date" maDmpTarget="dataset.issued"/>
+                    <mapping source="metadata.license.id" maDmpTarget="dataset.distribution.license.license_ref"/>
+                    <mapping source="metadata.license.created" maDmpTarget="dataset.distribution.license.start_date"/>
                 </mappings>
                 <fixedMappings>
-                    <fixedMapping target="tags" value="[{&quot;id&quot;: &quot;test&quot;, &quot;name&quot;: &quot;test&quot;}]"/>
-                    <fixedMapping maDmpTarget="dataset.distribution.host.title" value="zenodo" />
+                    <fixedMapping maDmpTarget="dataset.distribution.host.title" value="Zenodo" />
                 </fixedMappings>
             </prefillingGet>
         </config>