diff --git a/conf/output/test-output-rppd-lobid-0.json b/conf/output/test-output-rppd-lobid-0.json
index f0b2da1a..7d43b023 100644
--- a/conf/output/test-output-rppd-lobid-0.json
+++ b/conf/output/test-output-rppd-lobid-0.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00006",
   "preferredName" : "Humperdinck, Engelbert",
   "variantName" : [ "Humperdink, Engelbert", "Humperdinck, E.", "Humperdinck, Engelbert" ],
-  "dateOfBirth" : [ "01.09.1854" ],
-  "dateOfDeath" : [ "27.09.1921" ],
+  "dateOfBirth" : [ "1854-09-01" ],
+  "dateOfDeath" : [ "1921-09-27" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-1.json b/conf/output/test-output-rppd-lobid-1.json
index 7d8da2ac..8c9d03c8 100644
--- a/conf/output/test-output-rppd-lobid-1.json
+++ b/conf/output/test-output-rppd-lobid-1.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00007",
   "preferredName" : "Cornelius, Otto",
   "variantName" : [ "Cornelius, Otto" ],
-  "dateOfBirth" : [ "14.11.1896" ],
+  "dateOfBirth" : [ "1896-11-14" ],
   "dateOfDeath" : [ "1984" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-10.json b/conf/output/test-output-rppd-lobid-10.json
index f253450d..fa68b1ce 100644
--- a/conf/output/test-output-rppd-lobid-10.json
+++ b/conf/output/test-output-rppd-lobid-10.json
@@ -2,11 +2,10 @@
   "rppdId" : "pk00019",
   "id" : "https://lbz.rlp.de/rppd/pk00019",
   "preferredName" : "Oppermann, Julius",
-  "dateOfBirth" : [ "09.06.1825" ],
-  "dateOfDeath" : [ "01.01.1880" ],
+  "dateOfBirth" : [ "1825-06-09" ],
+  "dateOfDeath" : [ "1880-01-01" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-11.json b/conf/output/test-output-rppd-lobid-11.json
index 388bafc9..af846390 100644
--- a/conf/output/test-output-rppd-lobid-11.json
+++ b/conf/output/test-output-rppd-lobid-11.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00020",
   "preferredName" : "Bücker, Carl Clemens",
   "variantName" : [ "Bücker, Carl Clemens" ],
-  "dateOfBirth" : [ "11.02.1895" ],
-  "dateOfDeath" : [ "03.03.1976" ],
+  "dateOfBirth" : [ "1895-02-11" ],
+  "dateOfDeath" : [ "1976-03-03" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-12.json b/conf/output/test-output-rppd-lobid-12.json
index 6d79d838..8964ef91 100644
--- a/conf/output/test-output-rppd-lobid-12.json
+++ b/conf/output/test-output-rppd-lobid-12.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00021",
   "preferredName" : "Anschuez, Carl",
   "variantName" : [ "Anschutz, Carl / 1818-1870", "Anschütz, Karl Friedrich Nikolaus / 1818-1870" ],
-  "dateOfBirth" : [ "10.01.1818" ],
-  "dateOfDeath" : [ "30.12.1870" ],
+  "dateOfBirth" : [ "1818-01-10" ],
+  "dateOfDeath" : [ "1870-12-30" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-13.json b/conf/output/test-output-rppd-lobid-13.json
index 22a5df14..0174782d 100644
--- a/conf/output/test-output-rppd-lobid-13.json
+++ b/conf/output/test-output-rppd-lobid-13.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00022",
   "preferredName" : "Anschuez, Joseph Andreas",
   "variantName" : [ "Anschütz, Josef Andreas", "Anschuez, Johann Andreas", "Anschuez, Josef Andreas", "Anschütz, Joseph Andreas", "Anschuetz, Johann Andreas", "Anschuez, J. A.", "Anschütz, J. A.", "Anschütz, Johann Andreas", "Anschuez, Joseph Andreas" ],
-  "dateOfBirth" : [ "19.03.1772" ],
-  "dateOfDeath" : [ "26.12.1855" ],
+  "dateOfBirth" : [ "1772-03-19" ],
+  "dateOfDeath" : [ "1855-12-26" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-14.json b/conf/output/test-output-rppd-lobid-14.json
index 37435706..65099b0f 100644
--- a/conf/output/test-output-rppd-lobid-14.json
+++ b/conf/output/test-output-rppd-lobid-14.json
@@ -3,8 +3,7 @@
   "id" : "https://lbz.rlp.de/rppd/pk00023",
   "preferredName" : "Giefer, Willy",
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-15.json b/conf/output/test-output-rppd-lobid-15.json
index 77663c56..411e2249 100644
--- a/conf/output/test-output-rppd-lobid-15.json
+++ b/conf/output/test-output-rppd-lobid-15.json
@@ -2,11 +2,10 @@
   "rppdId" : "pk00028",
   "id" : "https://lbz.rlp.de/rppd/pk00028",
   "preferredName" : "Lehnen, Ewald",
-  "dateOfBirth" : [ "02.01.1894" ],
+  "dateOfBirth" : [ "1894-01-02" ],
   "dateOfDeath" : [ "Oktober 1989" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-16.json b/conf/output/test-output-rppd-lobid-16.json
index 8341608f..6a8a2db0 100644
--- a/conf/output/test-output-rppd-lobid-16.json
+++ b/conf/output/test-output-rppd-lobid-16.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00030",
   "preferredName" : "Meister, Simon",
   "variantName" : [ "Meister, Simon" ],
-  "dateOfBirth" : [ "20.12.1796" ],
-  "dateOfDeath" : [ "29.02.1844" ],
+  "dateOfBirth" : [ "1796-12-20" ],
+  "dateOfDeath" : [ "1844-02-29" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-17.json b/conf/output/test-output-rppd-lobid-17.json
index 1dadabb9..377bdae1 100644
--- a/conf/output/test-output-rppd-lobid-17.json
+++ b/conf/output/test-output-rppd-lobid-17.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00031",
   "preferredName" : "Bodewig, Robert",
   "variantName" : [ "Bodewig, Robert / 1857-1923" ],
-  "dateOfBirth" : [ "01.12.1857" ],
-  "dateOfDeath" : [ "02.12.1923" ],
+  "dateOfBirth" : [ "1857-12-01" ],
+  "dateOfDeath" : [ "1923-12-02" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-18.json b/conf/output/test-output-rppd-lobid-18.json
index ca0fc399..e971b5e1 100644
--- a/conf/output/test-output-rppd-lobid-18.json
+++ b/conf/output/test-output-rppd-lobid-18.json
@@ -4,10 +4,9 @@
   "preferredName" : "Altgeld, Johann Philipp",
   "variantName" : [ "Altgelt, Johann Philipp" ],
   "dateOfBirth" : [ "1603" ],
-  "dateOfDeath" : [ "12.12.1658" ],
+  "dateOfDeath" : [ "1658-12-12" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-19.json b/conf/output/test-output-rppd-lobid-19.json
index dbb7a1eb..0dae2c86 100644
--- a/conf/output/test-output-rppd-lobid-19.json
+++ b/conf/output/test-output-rppd-lobid-19.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pta1481",
   "preferredName" : "Zenz, Emil",
   "variantName" : [ "Zenz, Emil" ],
-  "dateOfBirth" : [ "24.07.1912" ],
-  "dateOfDeath" : [ "03.02.1994" ],
+  "dateOfBirth" : [ "1912-07-24" ],
+  "dateOfDeath" : [ "1994-02-03" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-2.json b/conf/output/test-output-rppd-lobid-2.json
index c48d403f..e6548668 100644
--- a/conf/output/test-output-rppd-lobid-2.json
+++ b/conf/output/test-output-rppd-lobid-2.json
@@ -2,11 +2,10 @@
   "rppdId" : "pk00008",
   "id" : "https://lbz.rlp.de/rppd/pk00008",
   "preferredName" : "Daub, Richard",
-  "dateOfBirth" : [ "04.04.1895" ],
-  "dateOfDeath" : [ "23.04.1972" ],
+  "dateOfBirth" : [ "1895-04-04" ],
+  "dateOfDeath" : [ "1972-04-23" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-20.json b/conf/output/test-output-rppd-lobid-20.json
index 1ff988aa..1526ef5b 100644
--- a/conf/output/test-output-rppd-lobid-20.json
+++ b/conf/output/test-output-rppd-lobid-20.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pta1482",
   "preferredName" : "Zenzen, Wilhelm",
   "variantName" : [ "Zenzen, Eucharius ¬[Ordensname]¬" ],
-  "dateOfBirth" : [ "17.10.1903" ],
-  "dateOfDeath" : [ "16.04.1963" ],
+  "dateOfBirth" : [ "1903-10-17" ],
+  "dateOfDeath" : [ "1963-04-16" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-21.json b/conf/output/test-output-rppd-lobid-21.json
index 5c5bfc31..bc6e6d24 100644
--- a/conf/output/test-output-rppd-lobid-21.json
+++ b/conf/output/test-output-rppd-lobid-21.json
@@ -2,11 +2,10 @@
   "rppdId" : "pta1483",
   "id" : "https://lbz.rlp.de/rppd/pta1483",
   "preferredName" : "Zettelmeyer, Hubert",
-  "dateOfBirth" : [ "08.11.1866" ],
-  "dateOfDeath" : [ "19.06.1930" ],
+  "dateOfBirth" : [ "1866-11-08" ],
+  "dateOfDeath" : [ "1930-06-19" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-22.json b/conf/output/test-output-rppd-lobid-22.json
index d92588d7..2c082409 100644
--- a/conf/output/test-output-rppd-lobid-22.json
+++ b/conf/output/test-output-rppd-lobid-22.json
@@ -2,11 +2,10 @@
   "rppdId" : "pta1485",
   "id" : "https://lbz.rlp.de/rppd/pta1485",
   "preferredName" : "Ziegler, Jakob Anton",
-  "dateOfBirth" : [ "15.06.1893" ],
-  "dateOfDeath" : [ "12.05.1944" ],
+  "dateOfBirth" : [ "1893-06-15" ],
+  "dateOfDeath" : [ "1944-05-12" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-23.json b/conf/output/test-output-rppd-lobid-23.json
index 8553102d..4060e405 100644
--- a/conf/output/test-output-rppd-lobid-23.json
+++ b/conf/output/test-output-rppd-lobid-23.json
@@ -2,11 +2,10 @@
   "rppdId" : "pta1486",
   "id" : "https://lbz.rlp.de/rppd/pta1486",
   "preferredName" : "Zill, Egon",
-  "dateOfBirth" : [ "26.03.1906" ],
-  "dateOfDeath" : [ "23.10.1974" ],
+  "dateOfBirth" : [ "1906-03-26" ],
+  "dateOfDeath" : [ "1974-10-23" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-24.json b/conf/output/test-output-rppd-lobid-24.json
index 29d9306e..3ab83107 100644
--- a/conf/output/test-output-rppd-lobid-24.json
+++ b/conf/output/test-output-rppd-lobid-24.json
@@ -2,11 +2,10 @@
   "rppdId" : "pta1487",
   "id" : "https://lbz.rlp.de/rppd/pta1487",
   "preferredName" : "Zillgen, Friedrich Josef",
-  "dateOfBirth" : [ "29.08.1806" ],
-  "dateOfDeath" : [ "10.06.1870" ],
+  "dateOfBirth" : [ "1806-08-29" ],
+  "dateOfDeath" : [ "1870-06-10" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-25.json b/conf/output/test-output-rppd-lobid-25.json
index d2149723..cbcc1fcc 100644
--- a/conf/output/test-output-rppd-lobid-25.json
+++ b/conf/output/test-output-rppd-lobid-25.json
@@ -2,11 +2,10 @@
   "rppdId" : "pta1488",
   "id" : "https://lbz.rlp.de/rppd/pta1488",
   "preferredName" : "Zillig, Hermann",
-  "dateOfBirth" : [ "21.04.1893" ],
-  "dateOfDeath" : [ "16.10.1952" ],
+  "dateOfBirth" : [ "1893-04-21" ],
+  "dateOfDeath" : [ "1952-10-16" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-26.json b/conf/output/test-output-rppd-lobid-26.json
index 4859f21a..aaf0f151 100644
--- a/conf/output/test-output-rppd-lobid-26.json
+++ b/conf/output/test-output-rppd-lobid-26.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pta1489",
   "preferredName" : "Zilliken, Kaspar Josef",
   "variantName" : [ "Zilliken, Kaspar Joseph", "Zilliken, Joseph" ],
-  "dateOfBirth" : [ "17.09.1872" ],
-  "dateOfDeath" : [ "03.10.1942" ],
+  "dateOfBirth" : [ "1872-09-17" ],
+  "dateOfDeath" : [ "1942-10-03" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-27.json b/conf/output/test-output-rppd-lobid-27.json
index 3c68a5e8..548f7523 100644
--- a/conf/output/test-output-rppd-lobid-27.json
+++ b/conf/output/test-output-rppd-lobid-27.json
@@ -2,11 +2,10 @@
   "rppdId" : "pta1491",
   "id" : "https://lbz.rlp.de/rppd/pta1491",
   "preferredName" : "Zimmer, Franz Nikolaus",
-  "dateOfBirth" : [ "28.07.1883" ],
-  "dateOfDeath" : [ "16.05.1955" ],
+  "dateOfBirth" : [ "1883-07-28" ],
+  "dateOfDeath" : [ "1955-05-16" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-28.json b/conf/output/test-output-rppd-lobid-28.json
index 4c78cfd3..c3e3d66a 100644
--- a/conf/output/test-output-rppd-lobid-28.json
+++ b/conf/output/test-output-rppd-lobid-28.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pta1492",
   "preferredName" : "Zimmer, Josef",
   "variantName" : [ "Zimmer, Jupp" ],
-  "dateOfBirth" : [ "03.09.1919" ],
-  "dateOfDeath" : [ "20.11.1995" ],
+  "dateOfBirth" : [ "1919-09-03" ],
+  "dateOfDeath" : [ "1995-11-20" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-29.json b/conf/output/test-output-rppd-lobid-29.json
index 4e1d2e26..c67dad35 100644
--- a/conf/output/test-output-rppd-lobid-29.json
+++ b/conf/output/test-output-rppd-lobid-29.json
@@ -2,8 +2,12 @@
   "rppdId" : "pta1493",
   "id" : "https://lbz.rlp.de/rppd/pta1493",
   "preferredName" : "Zimmer, Michael Kunibert",
-  "dateOfBirth" : [ "05.01.1902" ],
-  "dateOfDeath" : [ "21.12.1974" ],
+  "dateOfBirth" : [ "1902-01-05" ],
+  "dateOfDeath" : [ "1974-12-21" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-3.json b/conf/output/test-output-rppd-lobid-3.json
index ffbe8b0f..89b277e2 100644
--- a/conf/output/test-output-rppd-lobid-3.json
+++ b/conf/output/test-output-rppd-lobid-3.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00010",
   "preferredName" : "Billaudelle, Karl",
   "variantName" : [ "Billaudelle, Karl" ],
-  "dateOfBirth" : [ "05.11.1914" ],
-  "dateOfDeath" : [ "01.07.2003" ],
+  "dateOfBirth" : [ "1914-11-05" ],
+  "dateOfDeath" : [ "2003-07-01" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-30.json b/conf/output/test-output-rppd-lobid-30.json
index 2df63728..22bead77 100644
--- a/conf/output/test-output-rppd-lobid-30.json
+++ b/conf/output/test-output-rppd-lobid-30.json
@@ -2,8 +2,12 @@
   "rppdId" : "pta1495",
   "id" : "https://lbz.rlp.de/rppd/pta1495",
   "preferredName" : "Zimmermann, Konstantin",
-  "dateOfBirth" : [ "27.12.1742" ],
-  "dateOfDeath" : [ "06.05.1825" ],
+  "dateOfBirth" : [ "1742-12-27" ],
+  "dateOfDeath" : [ "1825-05-06" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-31.json b/conf/output/test-output-rppd-lobid-31.json
index 5a3dc770..63972a62 100644
--- a/conf/output/test-output-rppd-lobid-31.json
+++ b/conf/output/test-output-rppd-lobid-31.json
@@ -2,8 +2,12 @@
   "rppdId" : "pta1496",
   "id" : "https://lbz.rlp.de/rppd/pta1496",
   "preferredName" : "Zirbes, Peter",
-  "dateOfBirth" : [ "10.01.1825" ],
-  "dateOfDeath" : [ "14.11.1901" ],
+  "dateOfBirth" : [ "1825-01-10" ],
+  "dateOfDeath" : [ "1901-11-14" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-32.json b/conf/output/test-output-rppd-lobid-32.json
index 6a00d2ca..f83cafe8 100644
--- a/conf/output/test-output-rppd-lobid-32.json
+++ b/conf/output/test-output-rppd-lobid-32.json
@@ -3,8 +3,12 @@
   "id" : "https://lbz.rlp.de/rppd/pta1497",
   "preferredName" : "Zuckermandel, Moses S.",
   "variantName" : [ "Zuckermandel, Moses Samuel / 1836-1917" ],
-  "dateOfBirth" : [ "24.04.1836" ],
+  "dateOfBirth" : [ "1836-04-24" ],
   "dateOfDeath" : [ "1917" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-33.json b/conf/output/test-output-rppd-lobid-33.json
index 1824cc2c..32d1bbdb 100644
--- a/conf/output/test-output-rppd-lobid-33.json
+++ b/conf/output/test-output-rppd-lobid-33.json
@@ -2,8 +2,12 @@
   "rppdId" : "pta1498",
   "id" : "https://lbz.rlp.de/rppd/pta1498",
   "preferredName" : "Züscher, Peter",
-  "dateOfBirth" : [ "03.12.1859" ],
-  "dateOfDeath" : [ "03.06.1915" ],
+  "dateOfBirth" : [ "1859-12-03" ],
+  "dateOfDeath" : [ "1915-06-03" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-34.json b/conf/output/test-output-rppd-lobid-34.json
index 82753a6a..fdeb55e1 100644
--- a/conf/output/test-output-rppd-lobid-34.json
+++ b/conf/output/test-output-rppd-lobid-34.json
@@ -2,8 +2,12 @@
   "rppdId" : "pta1499",
   "id" : "https://lbz.rlp.de/rppd/pta1499",
   "preferredName" : "Zunker, Wilhelm",
-  "dateOfBirth" : [ "15.03.1895" ],
-  "dateOfDeath" : [ "10.12.1951" ],
+  "dateOfBirth" : [ "1895-03-15" ],
+  "dateOfDeath" : [ "1951-12-10" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-35.json b/conf/output/test-output-rppd-lobid-35.json
index 3866f175..6e86a6a2 100644
--- a/conf/output/test-output-rppd-lobid-35.json
+++ b/conf/output/test-output-rppd-lobid-35.json
@@ -2,8 +2,12 @@
   "rppdId" : "pta1500",
   "id" : "https://lbz.rlp.de/rppd/pta1500",
   "preferredName" : "Zweiffel, Karl Hermann",
-  "dateOfBirth" : [ "17.08.1800" ],
+  "dateOfBirth" : [ "1800-08-17" ],
   "dateOfDeath" : [ "unbekannt" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2006-07-11"
   },
diff --git a/conf/output/test-output-rppd-lobid-36.json b/conf/output/test-output-rppd-lobid-36.json
index 55f4b401..0f1d1de3 100644
--- a/conf/output/test-output-rppd-lobid-36.json
+++ b/conf/output/test-output-rppd-lobid-36.json
@@ -2,8 +2,12 @@
   "rppdId" : "pk02185",
   "id" : "https://lbz.rlp.de/rppd/pk02185",
   "preferredName" : "Heinen, Norbert M.",
-  "dateOfBirth" : [ "28.11.1936" ],
-  "dateOfDeath" : [ "30.05.2023" ],
+  "dateOfBirth" : [ "1936-11-28" ],
+  "dateOfDeath" : [ "2023-05-30" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2023-06-01"
   },
diff --git a/conf/output/test-output-rppd-lobid-37.json b/conf/output/test-output-rppd-lobid-37.json
index baecccba..27c694a9 100644
--- a/conf/output/test-output-rppd-lobid-37.json
+++ b/conf/output/test-output-rppd-lobid-37.json
@@ -3,8 +3,12 @@
   "id" : "https://lbz.rlp.de/rppd/pk05270",
   "preferredName" : "Dönges, Klaus",
   "variantName" : [ "Dönges, Klaus", "Dönges, Klaus / 1935-" ],
-  "dateOfBirth" : [ "25.05.1935" ],
-  "dateOfDeath" : [ "14.04.2023" ],
+  "dateOfBirth" : [ "1935-05-25" ],
+  "dateOfDeath" : [ "2023-04-14" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2023-06-01"
   },
diff --git a/conf/output/test-output-rppd-lobid-38.json b/conf/output/test-output-rppd-lobid-38.json
index 53c996f6..352ddec2 100644
--- a/conf/output/test-output-rppd-lobid-38.json
+++ b/conf/output/test-output-rppd-lobid-38.json
@@ -3,8 +3,12 @@
   "id" : "https://lbz.rlp.de/rppd/pk05621",
   "preferredName" : "Weinkauff, Franz",
   "variantName" : [ "Weinkauff, Franciscus / 1823-1892", "Weinkauff, Franz / 1823-1892", "Weinkauff, Franz / 1824-1892" ],
-  "dateOfBirth" : [ "24.05.1823" ],
-  "dateOfDeath" : [ "11.03.1892" ],
+  "dateOfBirth" : [ "1823-05-24" ],
+  "dateOfDeath" : [ "1892-03-11" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2023-06-01"
   },
diff --git a/conf/output/test-output-rppd-lobid-39.json b/conf/output/test-output-rppd-lobid-39.json
index 9e803205..2f52b18a 100644
--- a/conf/output/test-output-rppd-lobid-39.json
+++ b/conf/output/test-output-rppd-lobid-39.json
@@ -3,8 +3,12 @@
   "id" : "https://lbz.rlp.de/rppd/pk04515",
   "preferredName" : "Schneider, Anton",
   "variantName" : [ "Schneider, Anton / Bürgermeister" ],
-  "dateOfBirth" : [ "12.11.1899" ],
-  "dateOfDeath" : [ "24.06.1973" ],
+  "dateOfBirth" : [ "1899-11-12" ],
+  "dateOfDeath" : [ "1973-06-24" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2011-02-03"
   },
diff --git a/conf/output/test-output-rppd-lobid-4.json b/conf/output/test-output-rppd-lobid-4.json
index 5a411326..5d7a61f6 100644
--- a/conf/output/test-output-rppd-lobid-4.json
+++ b/conf/output/test-output-rppd-lobid-4.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00011",
   "preferredName" : "Grün, Willi H.",
   "variantName" : [ "Grün, Willi-Heinz / 1932-2016", "Grün, Willi Heinz / 1932-2016", "Grün, Willi H. / 1932-2016" ],
-  "dateOfBirth" : [ "10.10.1932" ],
-  "dateOfDeath" : [ "28.09.2016" ],
+  "dateOfBirth" : [ "1932-10-10" ],
+  "dateOfDeath" : [ "2016-09-28" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-40.json b/conf/output/test-output-rppd-lobid-40.json
index dc7adeed..f8cf15d2 100644
--- a/conf/output/test-output-rppd-lobid-40.json
+++ b/conf/output/test-output-rppd-lobid-40.json
@@ -2,8 +2,12 @@
   "rppdId" : "pke0292",
   "id" : "https://lbz.rlp.de/rppd/pke0292",
   "preferredName" : "Herr-Beck, Maria",
-  "dateOfBirth" : [ "08.06.1928" ],
-  "dateOfDeath" : [ "07.10.2015" ],
+  "dateOfBirth" : [ "1928-06-08" ],
+  "dateOfDeath" : [ "2015-10-07" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#female",
+    "label" : "Weiblich"
+  } ],
   "describedBy" : {
     "dateModified" : "2015-12-01"
   },
diff --git a/conf/output/test-output-rppd-lobid-41.json b/conf/output/test-output-rppd-lobid-41.json
index 1bfdf6bb..21b3a4bd 100644
--- a/conf/output/test-output-rppd-lobid-41.json
+++ b/conf/output/test-output-rppd-lobid-41.json
@@ -2,6 +2,10 @@
   "rppdId" : "pk02366",
   "id" : "https://lbz.rlp.de/rppd/pk02366",
   "preferredName" : "Fuchs, Gerhard",
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2008-02-22"
   },
diff --git a/conf/output/test-output-rppd-lobid-42.json b/conf/output/test-output-rppd-lobid-42.json
index 7ceaa701..0b9ec773 100644
--- a/conf/output/test-output-rppd-lobid-42.json
+++ b/conf/output/test-output-rppd-lobid-42.json
@@ -3,6 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk03654",
   "preferredName" : "Ratka, Alexander Simon",
   "dateOfBirth" : [ "1977" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2009-09-23"
   },
diff --git a/conf/output/test-output-rppd-lobid-43.json b/conf/output/test-output-rppd-lobid-43.json
index 3d470092..11276f04 100644
--- a/conf/output/test-output-rppd-lobid-43.json
+++ b/conf/output/test-output-rppd-lobid-43.json
@@ -2,6 +2,10 @@
   "rppdId" : "ps01055",
   "id" : "https://lbz.rlp.de/rppd/ps01055",
   "preferredName" : "Imo",
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2007-04-12"
   },
diff --git a/conf/output/test-output-rppd-lobid-44.json b/conf/output/test-output-rppd-lobid-44.json
index cd95ad5a..83f0d45e 100644
--- a/conf/output/test-output-rppd-lobid-44.json
+++ b/conf/output/test-output-rppd-lobid-44.json
@@ -4,6 +4,10 @@
   "preferredName" : "Alexander, Philipp",
   "dateOfBirth" : [ "1787" ],
   "dateOfDeath" : [ "1864" ],
+  "gender" : [ {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
+    "label" : "Männlich"
+  } ],
   "describedBy" : {
     "dateModified" : "2019-07-02"
   },
diff --git a/conf/output/test-output-rppd-lobid-5.json b/conf/output/test-output-rppd-lobid-5.json
index 9911513b..b3448ed3 100644
--- a/conf/output/test-output-rppd-lobid-5.json
+++ b/conf/output/test-output-rppd-lobid-5.json
@@ -4,8 +4,7 @@
   "preferredName" : "Marquard, Udo",
   "dateOfBirth" : [ "1959" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-6.json b/conf/output/test-output-rppd-lobid-6.json
index 9bf46501..704bfde1 100644
--- a/conf/output/test-output-rppd-lobid-6.json
+++ b/conf/output/test-output-rppd-lobid-6.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00013",
   "preferredName" : "Gabele, Anton",
   "variantName" : [ "Gabele, Anton" ],
-  "dateOfBirth" : [ "28.07.1890" ],
-  "dateOfDeath" : [ "13.08.1966" ],
+  "dateOfBirth" : [ "1890-07-28" ],
+  "dateOfDeath" : [ "1966-08-13" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-7.json b/conf/output/test-output-rppd-lobid-7.json
index 46652103..1627d7e7 100644
--- a/conf/output/test-output-rppd-lobid-7.json
+++ b/conf/output/test-output-rppd-lobid-7.json
@@ -5,8 +5,7 @@
   "dateOfBirth" : [ "1912" ],
   "dateOfDeath" : [ "1995" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-8.json b/conf/output/test-output-rppd-lobid-8.json
index f721df28..5d951b53 100644
--- a/conf/output/test-output-rppd-lobid-8.json
+++ b/conf/output/test-output-rppd-lobid-8.json
@@ -2,10 +2,9 @@
   "rppdId" : "pk00015",
   "id" : "https://lbz.rlp.de/rppd/pk00015",
   "preferredName" : "Anhäuser, Uwe",
-  "dateOfBirth" : [ "01.11.1943" ],
+  "dateOfBirth" : [ "1943-11-01" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/output/test-output-rppd-lobid-9.json b/conf/output/test-output-rppd-lobid-9.json
index 7acc3cb9..1e18ac4c 100644
--- a/conf/output/test-output-rppd-lobid-9.json
+++ b/conf/output/test-output-rppd-lobid-9.json
@@ -3,11 +3,10 @@
   "id" : "https://lbz.rlp.de/rppd/pk00018",
   "preferredName" : "Reinirkens, Leonhard",
   "variantName" : [ "Reinirkens, Leonhard" ],
-  "dateOfBirth" : [ "07.08.1924" ],
-  "dateOfDeath" : [ "23.03.2008" ],
+  "dateOfBirth" : [ "1924-08-07" ],
+  "dateOfDeath" : [ "2008-03-23" ],
   "gender" : [ {
-    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male"
-  }, {
+    "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
     "label" : "Männlich"
   } ],
   "describedBy" : {
diff --git a/conf/rppd-to-lobid.fix b/conf/rppd-to-lobid.fix
index 4f39c42e..b2e3dbcb 100644
--- a/conf/rppd-to-lobid.fix
+++ b/conf/rppd-to-lobid.fix
@@ -25,7 +25,7 @@ trim("preferredName")
 
 set_array("variantName[]")
 copy_field("f1nc[].*.f1nc", "variantName[].$append")
-copy_field("f1nd[].*.f1nd", "variantName[].$append")
+copy_field("f1nd[].*.f1nd", "variantName[].$last")
 uniq("variantName[]")
 
 
@@ -56,6 +56,7 @@ uniq("variantName[]")
 # #1np (Geburtsdatum) -> dateOfBirth
 # Kommentar Doku: mit Punkten und führenden Nullen: 04.05.1950; für Jahrestagsanzeige: die erste 4stellige Zahl im Feld wird als Jahr aufgefasst, dh auch "März 1908" ist möglich; Jahre mit „um“, „vor“, „nach“ und „zwischen“ werden nicht als Jubiläumsjahr aufgefasst.
 set_array("dateOfBirth[]")
+replace_all("f1np", "(\\d{2})\\.(\\d{2})\\.(\\d{4})", "$3-$2-$1")
 copy_field("f1np", "dateOfBirth[].$append")
 
 # -------
@@ -67,6 +68,7 @@ copy_field("f1np", "dateOfBirth[].$append")
 ## Kommentar Doku: s. #1np
 
 set_array("dateOfDeath[]")
+replace_all("f1nr", "(\\d{2})\\.(\\d{2})\\.(\\d{4})", "$3-$2-$1")
 copy_field("f1nr", "dateOfDeath[].$append")
 
 # -------
@@ -93,11 +95,11 @@ copy_field("f1nr", "dateOfDeath[].$append")
 set_array("gender[]")
 if any_equal("f1nv", "mmm")
   set_field("gender[].$append.id", "https://d-nb.info/standards/vocab/gnd/gender#male")
-  set_field("gender[].$append.label", "Männlich")
+  set_field("gender[].$last.label", "Männlich")
 end
 if any_equal("f1nv", "www")
   set_field("gender[].$append.id", "https://d-nb.info/standards/vocab/gnd/gender#female")
-  set_field("gender[].$append.label", "Weiblich")
+  set_field("gender[].$last.label", "Weiblich")
 end
 
 # -------