diff --git a/conf/output/test-output-0.json b/conf/output/test-output-0.json
index 080b68bf..f9dab878 100644
--- a/conf/output/test-output-0.json
+++ b/conf/output/test-output-0.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112200",
-  "id" : "https://lobid.org/resources/RPB929t112200",
+  "rpbId" : "929t112200",
+  "id" : "https://lobid.org/resources/929t112200",
   "hbzId" : "CT003010348",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -73,5 +73,9 @@
     },
     "type" : [ "Contribution" ]
   } ],
-  "bibliographicCitation" : "Bertius, Petrus : P. Bertii Tabularum geographicarum contractarum libri septem; 456"
+  "bibliographicCitation" : "Bertius, Petrus : P. Bertii Tabularum geographicarum contractarum libri septem; 456",
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:1-68551",
+    "label" : "urn:nbn:de:hbz:061:1-68551"
+  } ]
 }
diff --git a/conf/output/test-output-1.json b/conf/output/test-output-1.json
index 353b8a03..b1af05d1 100644
--- a/conf/output/test-output-1.json
+++ b/conf/output/test-output-1.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112201",
-  "id" : "https://lobid.org/resources/RPB929t112201",
+  "rpbId" : "929t112201",
+  "id" : "https://lobid.org/resources/929t112201",
   "hbzId" : "CT003010543",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -73,5 +73,9 @@
     },
     "type" : [ "Contribution" ]
   } ],
-  "bibliographicCitation" : "Bertius, Petrus : P. Bertii Tabularum geographicarum contractarum libri septem; 380"
+  "bibliographicCitation" : "Bertius, Petrus : P. Bertii Tabularum geographicarum contractarum libri septem; 380",
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:1-70507",
+    "label" : "urn:nbn:de:hbz:061:1-70507"
+  } ]
 }
diff --git a/conf/output/test-output-10.json b/conf/output/test-output-10.json
index 34fcee77..1d20d22e 100644
--- a/conf/output/test-output-10.json
+++ b/conf/output/test-output-10.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121512",
-  "id" : "https://lobid.org/resources/RPB036t0121512",
+  "rpbId" : "036t0121512",
+  "id" : "https://lobid.org/resources/036t0121512",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-11.json b/conf/output/test-output-11.json
index c840d2c1..fdc9278a 100644
--- a/conf/output/test-output-11.json
+++ b/conf/output/test-output-11.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121513",
-  "id" : "https://lobid.org/resources/RPB036t0121513",
+  "rpbId" : "036t0121513",
+  "id" : "https://lobid.org/resources/036t0121513",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-12.json b/conf/output/test-output-12.json
index 828fd7f2..601b9dba 100644
--- a/conf/output/test-output-12.json
+++ b/conf/output/test-output-12.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121514",
-  "id" : "https://lobid.org/resources/RPB036t0121514",
+  "rpbId" : "036t0121514",
+  "id" : "https://lobid.org/resources/036t0121514",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-13.json b/conf/output/test-output-13.json
index dbb7a4c0..d8454a68 100644
--- a/conf/output/test-output-13.json
+++ b/conf/output/test-output-13.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121515",
-  "id" : "https://lobid.org/resources/RPB036t0121515",
+  "rpbId" : "036t0121515",
+  "id" : "https://lobid.org/resources/036t0121515",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-14.json b/conf/output/test-output-14.json
index 035170bd..0ec12aa7 100644
--- a/conf/output/test-output-14.json
+++ b/conf/output/test-output-14.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121516",
-  "id" : "https://lobid.org/resources/RPB036t0121516",
+  "rpbId" : "036t0121516",
+  "id" : "https://lobid.org/resources/036t0121516",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-15.json b/conf/output/test-output-15.json
index d48cb013..d27e1a34 100644
--- a/conf/output/test-output-15.json
+++ b/conf/output/test-output-15.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121517",
-  "id" : "https://lobid.org/resources/RPB036t0121517",
+  "rpbId" : "036t0121517",
+  "id" : "https://lobid.org/resources/036t0121517",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-16.json b/conf/output/test-output-16.json
index df4d4e4c..3e673cee 100644
--- a/conf/output/test-output-16.json
+++ b/conf/output/test-output-16.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121518",
-  "id" : "https://lobid.org/resources/RPB036t0121518",
+  "rpbId" : "036t0121518",
+  "id" : "https://lobid.org/resources/036t0121518",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-17.json b/conf/output/test-output-17.json
index 767c002b..14548c38 100644
--- a/conf/output/test-output-17.json
+++ b/conf/output/test-output-17.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121519",
-  "id" : "https://lobid.org/resources/RPB036t0121519",
+  "rpbId" : "036t0121519",
+  "id" : "https://lobid.org/resources/036t0121519",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-18.json b/conf/output/test-output-18.json
index 57373064..389c1c9d 100644
--- a/conf/output/test-output-18.json
+++ b/conf/output/test-output-18.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121520",
-  "id" : "https://lobid.org/resources/RPB036t0121520",
+  "rpbId" : "036t0121520",
+  "id" : "https://lobid.org/resources/036t0121520",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-19.json b/conf/output/test-output-19.json
index ed42c2aa..0fe3aa98 100644
--- a/conf/output/test-output-19.json
+++ b/conf/output/test-output-19.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0121521",
-  "id" : "https://lobid.org/resources/RPB036t0121521",
+  "rpbId" : "036t0121521",
+  "id" : "https://lobid.org/resources/036t0121521",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-2.json b/conf/output/test-output-2.json
index 737cd0ed..e060c558 100644
--- a/conf/output/test-output-2.json
+++ b/conf/output/test-output-2.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112202",
-  "id" : "https://lobid.org/resources/RPB929t112202",
+  "rpbId" : "929t112202",
+  "id" : "https://lobid.org/resources/929t112202",
   "hbzId" : "CT003010542",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -73,5 +73,9 @@
     },
     "type" : [ "Contribution" ]
   } ],
-  "bibliographicCitation" : "Bertius, Petrus : P. Bertii Tabularum geographicarum contractarum libri septem; 378"
+  "bibliographicCitation" : "Bertius, Petrus : P. Bertii Tabularum geographicarum contractarum libri septem; 378",
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:1-70495",
+    "label" : "urn:nbn:de:hbz:061:1-70495"
+  } ]
 }
diff --git a/conf/output/test-output-20.json b/conf/output/test-output-20.json
index a15a1d8b..ad079753 100644
--- a/conf/output/test-output-20.json
+++ b/conf/output/test-output-20.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147869",
-  "id" : "https://lobid.org/resources/RPB107t01147869",
+  "rpbId" : "107t01147869",
+  "id" : "https://lobid.org/resources/107t01147869",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-21.json b/conf/output/test-output-21.json
index b1ec9d5e..dc20e147 100644
--- a/conf/output/test-output-21.json
+++ b/conf/output/test-output-21.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147870",
-  "id" : "https://lobid.org/resources/RPB107t01147870",
+  "rpbId" : "107t01147870",
+  "id" : "https://lobid.org/resources/107t01147870",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-22.json b/conf/output/test-output-22.json
index 11794b07..60eec7b6 100644
--- a/conf/output/test-output-22.json
+++ b/conf/output/test-output-22.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147871",
-  "id" : "https://lobid.org/resources/RPB107t01147871",
+  "rpbId" : "107t01147871",
+  "id" : "https://lobid.org/resources/107t01147871",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-23.json b/conf/output/test-output-23.json
index 2bf9ad36..46befaeb 100644
--- a/conf/output/test-output-23.json
+++ b/conf/output/test-output-23.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147872",
-  "id" : "https://lobid.org/resources/RPB107t01147872",
+  "rpbId" : "107t01147872",
+  "id" : "https://lobid.org/resources/107t01147872",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
@@ -24,10 +24,10 @@
     }
   }, {
     "type" : [ "ComplexSubject" ],
-    "label" : "Burg Neuscharfeneck / Flemlingen | Brunnen",
+    "label" : "Burgruine Neuscharfeneck | Brunnen",
     "componentList" : [ {
       "id" : "https://d-nb.info/gnd/4595996-1",
-      "label" : "Burg Neuscharfeneck / Flemlingen",
+      "label" : "Burgruine Neuscharfeneck",
       "source" : {
         "id" : "https://d-nb.info/gnd/7749153-1",
         "label" : "Gemeinsame Normdatei (GND)"
diff --git a/conf/output/test-output-24.json b/conf/output/test-output-24.json
index 1a57c53d..1819ec83 100644
--- a/conf/output/test-output-24.json
+++ b/conf/output/test-output-24.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147873",
-  "id" : "https://lobid.org/resources/RPB107t01147873",
+  "rpbId" : "107t01147873",
+  "id" : "https://lobid.org/resources/107t01147873",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-25.json b/conf/output/test-output-25.json
index 71adb34f..4f8b69ea 100644
--- a/conf/output/test-output-25.json
+++ b/conf/output/test-output-25.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147874",
-  "id" : "https://lobid.org/resources/RPB107t01147874",
+  "rpbId" : "107t01147874",
+  "id" : "https://lobid.org/resources/107t01147874",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-26.json b/conf/output/test-output-26.json
index f625d8e0..a0dd017a 100644
--- a/conf/output/test-output-26.json
+++ b/conf/output/test-output-26.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147875",
-  "id" : "https://lobid.org/resources/RPB107t01147875",
+  "rpbId" : "107t01147875",
+  "id" : "https://lobid.org/resources/107t01147875",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-27.json b/conf/output/test-output-27.json
index b5cd97f7..b8c9c430 100644
--- a/conf/output/test-output-27.json
+++ b/conf/output/test-output-27.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB107t01147876",
-  "id" : "https://lobid.org/resources/RPB107t01147876",
+  "rpbId" : "107t01147876",
+  "id" : "https://lobid.org/resources/107t01147876",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-28.json b/conf/output/test-output-28.json
index b0bb0f13..657e6688 100644
--- a/conf/output/test-output-28.json
+++ b/conf/output/test-output-28.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147877",
-  "id" : "https://lobid.org/resources/RPB107t01147877",
+  "rpbId" : "107t01147877",
+  "id" : "https://lobid.org/resources/107t01147877",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-29.json b/conf/output/test-output-29.json
index 2ac3fb47..9f302644 100644
--- a/conf/output/test-output-29.json
+++ b/conf/output/test-output-29.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t01147878",
-  "id" : "https://lobid.org/resources/RPB107t01147878",
+  "rpbId" : "107t01147878",
+  "id" : "https://lobid.org/resources/107t01147878",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-3.json b/conf/output/test-output-3.json
index c3905250..6320cc09 100644
--- a/conf/output/test-output-3.json
+++ b/conf/output/test-output-3.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112203",
-  "id" : "https://lobid.org/resources/RPB929t112203",
+  "rpbId" : "929t112203",
+  "id" : "https://lobid.org/resources/929t112203",
   "hbzId" : "CT003005235",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -108,7 +108,7 @@
     "type" : [ "Contribution" ]
   } ],
   "fulltextOnline" : [ {
-    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1643",
-    "label" : "urn:nbn:de:hbz:061:2-1643"
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-24485",
+    "label" : "urn:nbn:de:hbz:061:2-24485"
   } ]
 }
diff --git a/conf/output/test-output-30.json b/conf/output/test-output-30.json
index d6a8b9fc..f8660d95 100644
--- a/conf/output/test-output-30.json
+++ b/conf/output/test-output-30.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t982370",
-  "id" : "https://lobid.org/resources/RPB107t982370",
+  "rpbId" : "107t982370",
+  "id" : "https://lobid.org/resources/107t982370",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-31.json b/conf/output/test-output-31.json
index bf35c111..019d6cbf 100644
--- a/conf/output/test-output-31.json
+++ b/conf/output/test-output-31.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t982371",
-  "id" : "https://lobid.org/resources/RPB107t982371",
+  "rpbId" : "107t982371",
+  "id" : "https://lobid.org/resources/107t982371",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-32.json b/conf/output/test-output-32.json
index 9d1f1aa5..9dad14c1 100644
--- a/conf/output/test-output-32.json
+++ b/conf/output/test-output-32.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB107t982372",
-  "id" : "https://lobid.org/resources/RPB107t982372",
+  "rpbId" : "107t982372",
+  "id" : "https://lobid.org/resources/107t982372",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-33.json b/conf/output/test-output-33.json
index d4ddbd84..5db4cf43 100644
--- a/conf/output/test-output-33.json
+++ b/conf/output/test-output-33.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982373",
-  "id" : "https://lobid.org/resources/RPB107t982373",
+  "rpbId" : "107t982373",
+  "id" : "https://lobid.org/resources/107t982373",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-34.json b/conf/output/test-output-34.json
index cbf49f96..64954969 100644
--- a/conf/output/test-output-34.json
+++ b/conf/output/test-output-34.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982373",
+      "id" : "https://lobid.org/resources/107t982373",
       "label" : "SWR-3-Clubmagazin"
     } ],
     "numbering" : "1998,1(Sept.) -"
   } ],
-  "rpbId" : "RPB107t982373b1",
-  "id" : "https://lobid.org/resources/RPB107t982373b1",
+  "rpbId" : "107t982373b1",
+  "id" : "https://lobid.org/resources/107t982373b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-35.json b/conf/output/test-output-35.json
index cf29615d..5be1e8c5 100644
--- a/conf/output/test-output-35.json
+++ b/conf/output/test-output-35.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982374",
-  "id" : "https://lobid.org/resources/RPB107t982374",
+  "rpbId" : "107t982374",
+  "id" : "https://lobid.org/resources/107t982374",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-36.json b/conf/output/test-output-36.json
index 536433f0..b2add1d0 100644
--- a/conf/output/test-output-36.json
+++ b/conf/output/test-output-36.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982374",
+      "id" : "https://lobid.org/resources/107t982374",
       "label" : "On : SWF 3, das Magazin"
     } ],
     "numbering" : "1992 - 1998,2"
   } ],
-  "rpbId" : "RPB107t982374b1",
-  "id" : "https://lobid.org/resources/RPB107t982374b1",
+  "rpbId" : "107t982374b1",
+  "id" : "https://lobid.org/resources/107t982374b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-37.json b/conf/output/test-output-37.json
index 714d39de..6f84cbda 100644
--- a/conf/output/test-output-37.json
+++ b/conf/output/test-output-37.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982375",
-  "id" : "https://lobid.org/resources/RPB107t982375",
+  "rpbId" : "107t982375",
+  "id" : "https://lobid.org/resources/107t982375",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-38.json b/conf/output/test-output-38.json
index 9a98f637..f34f6103 100644
--- a/conf/output/test-output-38.json
+++ b/conf/output/test-output-38.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982375",
+      "id" : "https://lobid.org/resources/107t982375",
       "label" : "¬Die¬ Zeitschrift : der Südwestrundfunk und seine Programme. Rheinland-Pfalz"
     } ],
     "numbering" : "1998,1(Sept.) - 2001,9(Sept.)"
   } ],
-  "rpbId" : "RPB107t982375b1",
-  "id" : "https://lobid.org/resources/RPB107t982375b1",
+  "rpbId" : "107t982375b1",
+  "id" : "https://lobid.org/resources/107t982375b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-39.json b/conf/output/test-output-39.json
index 9ffbc253..c8017cb4 100644
--- a/conf/output/test-output-39.json
+++ b/conf/output/test-output-39.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982376",
-  "id" : "https://lobid.org/resources/RPB107t982376",
+  "rpbId" : "107t982376",
+  "id" : "https://lobid.org/resources/107t982376",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-4.json b/conf/output/test-output-4.json
index 281f108e..dbd51fb4 100644
--- a/conf/output/test-output-4.json
+++ b/conf/output/test-output-4.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112204",
-  "id" : "https://lobid.org/resources/RPB929t112204",
+  "rpbId" : "929t112204",
+  "id" : "https://lobid.org/resources/929t112204",
   "hbzId" : "CT003001337",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -101,7 +101,7 @@
     "type" : [ "Contribution" ]
   } ],
   "fulltextOnline" : [ {
-    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1616",
-    "label" : "urn:nbn:de:hbz:061:2-1616"
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1643",
+    "label" : "urn:nbn:de:hbz:061:2-1643"
   } ]
 }
diff --git a/conf/output/test-output-40.json b/conf/output/test-output-40.json
index f0ad03dd..e553f17c 100644
--- a/conf/output/test-output-40.json
+++ b/conf/output/test-output-40.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982376",
+      "id" : "https://lobid.org/resources/107t982376",
       "label" : "Flieg und flatter : Aktuelles aus der Vogelschutzwarte"
     } ],
     "numbering" : "Ausg. 1.1997(Dez.) -"
   } ],
-  "rpbId" : "RPB107t982376b1",
-  "id" : "https://lobid.org/resources/RPB107t982376b1",
+  "rpbId" : "107t982376b1",
+  "id" : "https://lobid.org/resources/107t982376b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-41.json b/conf/output/test-output-41.json
index 7c9f4da7..f27ba1ef 100644
--- a/conf/output/test-output-41.json
+++ b/conf/output/test-output-41.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982377",
-  "id" : "https://lobid.org/resources/RPB107t982377",
+  "rpbId" : "107t982377",
+  "id" : "https://lobid.org/resources/107t982377",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-42.json b/conf/output/test-output-42.json
index c9c6e079..8005f22e 100644
--- a/conf/output/test-output-42.json
+++ b/conf/output/test-output-42.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982377",
+      "id" : "https://lobid.org/resources/107t982377",
       "label" : "¬Der¬ Rasenspieler : das Journal zur Saison ..."
     } ],
     "numbering" : "Nachgewiesen 1998/99(1998) - 2000/01; 2001/02 - 2002/03"
   } ],
-  "rpbId" : "RPB107t982377b1",
-  "id" : "https://lobid.org/resources/RPB107t982377b1",
+  "rpbId" : "107t982377b1",
+  "id" : "https://lobid.org/resources/107t982377b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-43.json b/conf/output/test-output-43.json
index b18a2eef..52367065 100644
--- a/conf/output/test-output-43.json
+++ b/conf/output/test-output-43.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982378",
-  "id" : "https://lobid.org/resources/RPB107t982378",
+  "rpbId" : "107t982378",
+  "id" : "https://lobid.org/resources/107t982378",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-44.json b/conf/output/test-output-44.json
index 428d848c..4473ea9b 100644
--- a/conf/output/test-output-44.json
+++ b/conf/output/test-output-44.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982378",
+      "id" : "https://lobid.org/resources/107t982378",
       "label" : "¬'s¬ Derfsche : Ebertsheim-Rodenbach, das Dorf im Grünen"
     } ],
     "numbering" : "1998,Apr."
   } ],
-  "rpbId" : "RPB107t982378b1",
-  "id" : "https://lobid.org/resources/RPB107t982378b1",
+  "rpbId" : "107t982378b1",
+  "id" : "https://lobid.org/resources/107t982378b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-45.json b/conf/output/test-output-45.json
index 340b793c..3cf1ca8f 100644
--- a/conf/output/test-output-45.json
+++ b/conf/output/test-output-45.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB107t982379",
-  "id" : "https://lobid.org/resources/RPB107t982379",
+  "rpbId" : "107t982379",
+  "id" : "https://lobid.org/resources/107t982379",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-46.json b/conf/output/test-output-46.json
index ddc963f7..f1f9ee0d 100644
--- a/conf/output/test-output-46.json
+++ b/conf/output/test-output-46.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB107t982379",
+      "id" : "https://lobid.org/resources/107t982379",
       "label" : "Wer ist wo"
     } ],
     "numbering" : "1994/95(1995)"
   } ],
-  "rpbId" : "RPB107t982379b1",
-  "id" : "https://lobid.org/resources/RPB107t982379b1",
+  "rpbId" : "107t982379b1",
+  "id" : "https://lobid.org/resources/107t982379b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-47.json b/conf/output/test-output-47.json
index 7453833a..09c49361 100644
--- a/conf/output/test-output-47.json
+++ b/conf/output/test-output-47.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112190",
-  "id" : "https://lobid.org/resources/RPB929t112190",
+  "rpbId" : "929t112190",
+  "id" : "https://lobid.org/resources/929t112190",
   "hbzId" : "HT016832268",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
diff --git a/conf/output/test-output-48.json b/conf/output/test-output-48.json
index be7a6b03..fadb8cc1 100644
--- a/conf/output/test-output-48.json
+++ b/conf/output/test-output-48.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112191",
-  "id" : "https://lobid.org/resources/RPB929t112191",
+  "rpbId" : "929t112191",
+  "id" : "https://lobid.org/resources/929t112191",
   "hbzId" : "HT016831992",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
diff --git a/conf/output/test-output-49.json b/conf/output/test-output-49.json
index 6ab485ea..916bf3c6 100644
--- a/conf/output/test-output-49.json
+++ b/conf/output/test-output-49.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112192",
-  "id" : "https://lobid.org/resources/RPB929t112192",
+  "rpbId" : "929t112192",
+  "id" : "https://lobid.org/resources/929t112192",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-5.json b/conf/output/test-output-5.json
index 5f0fc142..b4f912e8 100644
--- a/conf/output/test-output-5.json
+++ b/conf/output/test-output-5.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112205",
-  "id" : "https://lobid.org/resources/RPB929t112205",
+  "rpbId" : "929t112205",
+  "id" : "https://lobid.org/resources/929t112205",
   "hbzId" : "CT003001334",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -98,5 +98,9 @@
       "label" : "Illustrator"
     },
     "type" : [ "Contribution" ]
+  } ],
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1616",
+    "label" : "urn:nbn:de:hbz:061:2-1616"
   } ]
 }
diff --git a/conf/output/test-output-50.json b/conf/output/test-output-50.json
index 7f306b4b..8898c1e3 100644
--- a/conf/output/test-output-50.json
+++ b/conf/output/test-output-50.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB929t112193",
-  "id" : "https://lobid.org/resources/RPB929t112193",
+  "rpbId" : "929t112193",
+  "id" : "https://lobid.org/resources/929t112193",
   "hbzId" : "HT016746268",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
diff --git a/conf/output/test-output-51.json b/conf/output/test-output-51.json
index 24f0e293..ebf1e815 100644
--- a/conf/output/test-output-51.json
+++ b/conf/output/test-output-51.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB929t112193",
+      "id" : "https://lobid.org/resources/929t112193",
       "label" : "Aktuell : das Krankenhaus in Ihrer Region"
     } ],
     "numbering" : "Nachgewiesen 2010 - 2012,1"
   } ],
-  "rpbId" : "RPB929t112193b1",
-  "id" : "https://lobid.org/resources/RPB929t112193b1",
+  "rpbId" : "929t112193b1",
+  "id" : "https://lobid.org/resources/929t112193b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-52.json b/conf/output/test-output-52.json
index 8f0c0a6b..95176136 100644
--- a/conf/output/test-output-52.json
+++ b/conf/output/test-output-52.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB929t112194",
-  "id" : "https://lobid.org/resources/RPB929t112194",
+  "rpbId" : "929t112194",
+  "id" : "https://lobid.org/resources/929t112194",
   "hbzId" : "HT016782338",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
diff --git a/conf/output/test-output-53.json b/conf/output/test-output-53.json
index fa9b2935..f1631f85 100644
--- a/conf/output/test-output-53.json
+++ b/conf/output/test-output-53.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB929t112194",
+      "id" : "https://lobid.org/resources/929t112194",
       "label" : "Clubzeitung"
     } ],
     "numbering" : "Nachgewiesen 2006,2 -"
   } ],
-  "rpbId" : "RPB929t112194b1",
-  "id" : "https://lobid.org/resources/RPB929t112194b1",
+  "rpbId" : "929t112194b1",
+  "id" : "https://lobid.org/resources/929t112194b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-54.json b/conf/output/test-output-54.json
index 74d7c620..d403347a 100644
--- a/conf/output/test-output-54.json
+++ b/conf/output/test-output-54.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112195",
-  "id" : "https://lobid.org/resources/RPB929t112195",
+  "rpbId" : "929t112195",
+  "id" : "https://lobid.org/resources/929t112195",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-55.json b/conf/output/test-output-55.json
index 07e45ec9..9b8fc5f0 100644
--- a/conf/output/test-output-55.json
+++ b/conf/output/test-output-55.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112196",
-  "id" : "https://lobid.org/resources/RPB929t112196",
+  "rpbId" : "929t112196",
+  "id" : "https://lobid.org/resources/929t112196",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-56.json b/conf/output/test-output-56.json
index 4d0a8b62..ff840665 100644
--- a/conf/output/test-output-56.json
+++ b/conf/output/test-output-56.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112197",
-  "id" : "https://lobid.org/resources/RPB929t112197",
+  "rpbId" : "929t112197",
+  "id" : "https://lobid.org/resources/929t112197",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-57.json b/conf/output/test-output-57.json
index 7d0fbe22..f1d9a192 100644
--- a/conf/output/test-output-57.json
+++ b/conf/output/test-output-57.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112198",
-  "id" : "https://lobid.org/resources/RPB929t112198",
+  "rpbId" : "929t112198",
+  "id" : "https://lobid.org/resources/929t112198",
   "hbzId" : "HT015954631",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -76,9 +76,5 @@
       "label" : "Autor/in"
     },
     "type" : [ "Contribution" ]
-  } ],
-  "fulltextOnline" : [ {
-    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:1-42026",
-    "label" : "urn:nbn:de:hbz:061:1-42026"
   } ]
 }
diff --git a/conf/output/test-output-58.json b/conf/output/test-output-58.json
index 728bb5a2..335df71a 100644
--- a/conf/output/test-output-58.json
+++ b/conf/output/test-output-58.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112199",
-  "id" : "https://lobid.org/resources/RPB929t112199",
+  "rpbId" : "929t112199",
+  "id" : "https://lobid.org/resources/929t112199",
   "hbzId" : "CT003007380",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -152,5 +152,9 @@
       "label" : "Sonstige"
     },
     "type" : [ "Contribution" ]
+  } ],
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:1-42026",
+    "label" : "urn:nbn:de:hbz:061:1-42026"
   } ]
 }
diff --git a/conf/output/test-output-59.json b/conf/output/test-output-59.json
index 0e9feca2..4a17d5fa 100644
--- a/conf/output/test-output-59.json
+++ b/conf/output/test-output-59.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB929t111801",
-  "id" : "https://lobid.org/resources/RPB929t111801",
+  "rpbId" : "929t111801",
+  "id" : "https://lobid.org/resources/929t111801",
   "hbzId" : "HT016782154",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
diff --git a/conf/output/test-output-6.json b/conf/output/test-output-6.json
index 7e4f4b6b..5c83341c 100644
--- a/conf/output/test-output-6.json
+++ b/conf/output/test-output-6.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112206",
-  "id" : "https://lobid.org/resources/RPB929t112206",
+  "rpbId" : "929t112206",
+  "id" : "https://lobid.org/resources/929t112206",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-60.json b/conf/output/test-output-60.json
index 2576151f..383bc4e8 100644
--- a/conf/output/test-output-60.json
+++ b/conf/output/test-output-60.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB929t111801",
+      "id" : "https://lobid.org/resources/929t111801",
       "label" : "Rhein-Zeitung : unabhängige Tageszeitung"
     } ],
     "numbering" : "66.2011,77(1.Apr.) -"
   } ],
-  "rpbId" : "RPB929t111801b1",
-  "id" : "https://lobid.org/resources/RPB929t111801b1",
+  "rpbId" : "929t111801b1",
+  "id" : "https://lobid.org/resources/929t111801b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-61.json b/conf/output/test-output-61.json
index 948dc434..3a1cf8ef 100644
--- a/conf/output/test-output-61.json
+++ b/conf/output/test-output-61.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084656",
-  "id" : "https://lobid.org/resources/RPB929t084656",
+  "rpbId" : "929t084656",
+  "id" : "https://lobid.org/resources/929t084656",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-62.json b/conf/output/test-output-62.json
index 327a97d6..811add02 100644
--- a/conf/output/test-output-62.json
+++ b/conf/output/test-output-62.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084657",
-  "id" : "https://lobid.org/resources/RPB929t084657",
+  "rpbId" : "929t084657",
+  "id" : "https://lobid.org/resources/929t084657",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-63.json b/conf/output/test-output-63.json
index f266668a..cfd3aff7 100644
--- a/conf/output/test-output-63.json
+++ b/conf/output/test-output-63.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084658",
-  "id" : "https://lobid.org/resources/RPB929t084658",
+  "rpbId" : "929t084658",
+  "id" : "https://lobid.org/resources/929t084658",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-64.json b/conf/output/test-output-64.json
index 612e6514..26eb9233 100644
--- a/conf/output/test-output-64.json
+++ b/conf/output/test-output-64.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084659",
-  "id" : "https://lobid.org/resources/RPB929t084659",
+  "rpbId" : "929t084659",
+  "id" : "https://lobid.org/resources/929t084659",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-65.json b/conf/output/test-output-65.json
index c745d3b0..1f527749 100644
--- a/conf/output/test-output-65.json
+++ b/conf/output/test-output-65.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084660",
-  "id" : "https://lobid.org/resources/RPB929t084660",
+  "rpbId" : "929t084660",
+  "id" : "https://lobid.org/resources/929t084660",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-66.json b/conf/output/test-output-66.json
index 12b5189e..dbd855f0 100644
--- a/conf/output/test-output-66.json
+++ b/conf/output/test-output-66.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084664",
-  "id" : "https://lobid.org/resources/RPB929t084664",
+  "rpbId" : "929t084664",
+  "id" : "https://lobid.org/resources/929t084664",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-67.json b/conf/output/test-output-67.json
index 6e3fbc61..ec5c520f 100644
--- a/conf/output/test-output-67.json
+++ b/conf/output/test-output-67.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084667",
-  "id" : "https://lobid.org/resources/RPB929t084667",
+  "rpbId" : "929t084667",
+  "id" : "https://lobid.org/resources/929t084667",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-68.json b/conf/output/test-output-68.json
index a2b43b8c..f50a6a14 100644
--- a/conf/output/test-output-68.json
+++ b/conf/output/test-output-68.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084686",
-  "id" : "https://lobid.org/resources/RPB929t084686",
+  "rpbId" : "929t084686",
+  "id" : "https://lobid.org/resources/929t084686",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-69.json b/conf/output/test-output-69.json
index a1bffafb..a2caeede 100644
--- a/conf/output/test-output-69.json
+++ b/conf/output/test-output-69.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084695",
-  "id" : "https://lobid.org/resources/RPB929t084695",
+  "rpbId" : "929t084695",
+  "id" : "https://lobid.org/resources/929t084695",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
@@ -31,10 +31,10 @@
     }
   }, {
     "type" : [ "ComplexSubject" ],
-    "label" : "Deutsches Rotes Kreuz / Deutschland / Ortsverein Adenau | Geschichte 1883-2008",
+    "label" : "Deutsches Rotes Kreuz / Ortsverein Adenau | Geschichte 1883-2008",
     "componentList" : [ {
       "id" : "https://d-nb.info/gnd/10361782-6",
-      "label" : "Deutsches Rotes Kreuz / Deutschland / Ortsverein Adenau",
+      "label" : "Deutsches Rotes Kreuz / Ortsverein Adenau",
       "source" : {
         "id" : "https://d-nb.info/gnd/7749153-1",
         "label" : "Gemeinsame Normdatei (GND)"
@@ -60,7 +60,7 @@
   "contribution" : [ {
     "agent" : {
       "id" : "https://d-nb.info/gnd/10361782-6",
-      "label" : "Deutsches Rotes Kreuz / Deutschland / Ortsverein Adenau"
+      "label" : "Deutsches Rotes Kreuz / Ortsverein Adenau"
     },
     "role" : {
       "id" : "http://id.loc.gov/vocabulary/relators/org",
diff --git a/conf/output/test-output-7.json b/conf/output/test-output-7.json
index b8512477..2b4459a5 100644
--- a/conf/output/test-output-7.json
+++ b/conf/output/test-output-7.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112207",
-  "id" : "https://lobid.org/resources/RPB929t112207",
+  "rpbId" : "929t112207",
+  "id" : "https://lobid.org/resources/929t112207",
   "hbzId" : "CT003001222",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -108,7 +108,7 @@
     "type" : [ "Contribution" ]
   } ],
   "fulltextOnline" : [ {
-    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1456",
-    "label" : "urn:nbn:de:hbz:061:2-1456"
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-536",
+    "label" : "urn:nbn:de:hbz:061:2-536"
   } ]
 }
diff --git a/conf/output/test-output-70.json b/conf/output/test-output-70.json
index 740ca72a..bde259ca 100644
--- a/conf/output/test-output-70.json
+++ b/conf/output/test-output-70.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t084698",
-  "id" : "https://lobid.org/resources/RPB929t084698",
+  "rpbId" : "929t084698",
+  "id" : "https://lobid.org/resources/929t084698",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-71.json b/conf/output/test-output-71.json
index 9c8aaf7a..8693e73c 100644
--- a/conf/output/test-output-71.json
+++ b/conf/output/test-output-71.json
@@ -1,9 +1,9 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t112440",
-  "id" : "https://lobid.org/resources/RPB929t112440",
-  "biblioVinoId" : "Nr27922",
+  "rpbId" : "929t112440",
+  "id" : "https://lobid.org/resources/929t112440",
+  "schoeneNummer" : "Nr27922",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-72.json b/conf/output/test-output-72.json
index 448a7ea7..b6b32725 100644
--- a/conf/output/test-output-72.json
+++ b/conf/output/test-output-72.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t190565",
-  "id" : "https://lobid.org/resources/RPB929t190565",
+  "rpbId" : "929t190565",
+  "id" : "https://lobid.org/resources/929t190565",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-73.json b/conf/output/test-output-73.json
index 1d5f1c03..8eeac930 100644
--- a/conf/output/test-output-73.json
+++ b/conf/output/test-output-73.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB929t01069600",
-  "id" : "https://lobid.org/resources/RPB929t01069600",
+  "rpbId" : "929t01069600",
+  "id" : "https://lobid.org/resources/929t01069600",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-74.json b/conf/output/test-output-74.json
index 5b05b691..0dd9a1f2 100644
--- a/conf/output/test-output-74.json
+++ b/conf/output/test-output-74.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB036t160240",
-  "id" : "https://lobid.org/resources/RPB036t160240",
+  "rpbId" : "036t160240",
+  "id" : "https://lobid.org/resources/036t160240",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-75.json b/conf/output/test-output-75.json
index eb2be09d..17893132 100644
--- a/conf/output/test-output-75.json
+++ b/conf/output/test-output-75.json
@@ -9,8 +9,8 @@
     } ],
     "numbering" : "[1]"
   } ],
-  "rpbId" : "RPB036t160240b1",
-  "id" : "https://lobid.org/resources/RPB036t160240b1",
+  "rpbId" : "036t160240b1",
+  "id" : "https://lobid.org/resources/036t160240b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-76.json b/conf/output/test-output-76.json
index fe3f95a9..7949e71d 100644
--- a/conf/output/test-output-76.json
+++ b/conf/output/test-output-76.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB036t160240",
+      "id" : "https://lobid.org/resources/036t160240",
       "label" : "Piffche-Bahnfahrt durch Rheinhessen"
     } ],
     "numbering" : "2"
   } ],
-  "rpbId" : "RPB036t160240b2",
-  "id" : "https://lobid.org/resources/RPB036t160240b2",
+  "rpbId" : "036t160240b2",
+  "id" : "https://lobid.org/resources/036t160240b2",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-77.json b/conf/output/test-output-77.json
index 5774f532..a96f8a62 100644
--- a/conf/output/test-output-77.json
+++ b/conf/output/test-output-77.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "MultiVolumeBook" ],
-  "rpbId" : "RPB121t0144215",
-  "id" : "https://lobid.org/resources/RPB121t0144215",
+  "rpbId" : "121t0144215",
+  "id" : "https://lobid.org/resources/121t0144215",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-78.json b/conf/output/test-output-78.json
index c8668bf2..d2a0da0b 100644
--- a/conf/output/test-output-78.json
+++ b/conf/output/test-output-78.json
@@ -4,13 +4,13 @@
   "isPartOf" : [ {
     "type" : [ "IsPartOfRelation" ],
     "hasSuperordinate" : [ {
-      "id" : "https://lobid.org/resources/RPB121t0144215",
+      "id" : "https://lobid.org/resources/121t0144215",
       "label" : "Bibliographie zu den Jahrbüchern des Kreises Daun"
     } ],
     "numbering" : "1973/90 (1990) -"
   } ],
-  "rpbId" : "RPB121t0144215b1",
-  "id" : "https://lobid.org/resources/RPB121t0144215b1",
+  "rpbId" : "121t0144215b1",
+  "id" : "https://lobid.org/resources/121t0144215b1",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-79.json b/conf/output/test-output-79.json
index dedcf30b..7e596b84 100644
--- a/conf/output/test-output-79.json
+++ b/conf/output/test-output-79.json
@@ -1,9 +1,9 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929w18032522",
-  "id" : "https://lobid.org/resources/RPB929w18032522",
-  "biblioVinoId" : "Nr32522",
+  "rpbId" : "929w18032522",
+  "id" : "https://lobid.org/resources/929w18032522",
+  "schoeneNummer" : "Nr32522",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013678171#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-8.json b/conf/output/test-output-8.json
index ecef0fbe..62ac5ab8 100644
--- a/conf/output/test-output-8.json
+++ b/conf/output/test-output-8.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112208",
-  "id" : "https://lobid.org/resources/RPB929t112208",
+  "rpbId" : "929t112208",
+  "id" : "https://lobid.org/resources/929t112208",
   "hbzId" : "CT003001317",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -106,5 +106,9 @@
       "label" : "Autor/in"
     },
     "type" : [ "Contribution" ]
+  } ],
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1456",
+    "label" : "urn:nbn:de:hbz:061:2-1456"
   } ]
 }
diff --git a/conf/output/test-output-80.json b/conf/output/test-output-80.json
index 89fab9fc..5ed6ae81 100644
--- a/conf/output/test-output-80.json
+++ b/conf/output/test-output-80.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Article" ],
-  "rpbId" : "RPB036t0115179",
-  "id" : "https://lobid.org/resources/RPB036t0115179",
+  "rpbId" : "036t0115179",
+  "id" : "https://lobid.org/resources/036t0115179",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-81.json b/conf/output/test-output-81.json
index e30d0e19..d41503c3 100644
--- a/conf/output/test-output-81.json
+++ b/conf/output/test-output-81.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t930040",
-  "id" : "https://lobid.org/resources/RPB929t930040",
+  "rpbId" : "929t930040",
+  "id" : "https://lobid.org/resources/929t930040",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-82.json b/conf/output/test-output-82.json
index 951870a1..6ae2e2be 100644
--- a/conf/output/test-output-82.json
+++ b/conf/output/test-output-82.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t920749",
-  "id" : "https://lobid.org/resources/RPB929t920749",
+  "rpbId" : "929t920749",
+  "id" : "https://lobid.org/resources/929t920749",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
     "type" : [ "Collection" ],
diff --git a/conf/output/test-output-9.json b/conf/output/test-output-9.json
index 5486958b..e687ddde 100644
--- a/conf/output/test-output-9.json
+++ b/conf/output/test-output-9.json
@@ -1,8 +1,8 @@
 {
   "@context" : "http://lobid.org/resources/context.jsonld",
   "type" : [ "BibliographicResource", "Book" ],
-  "rpbId" : "RPB929t112209",
-  "id" : "https://lobid.org/resources/RPB929t112209",
+  "rpbId" : "929t112209",
+  "id" : "https://lobid.org/resources/929t112209",
   "hbzId" : "CT003001333",
   "inCollection" : [ {
     "id" : "http://lobid.org/resources/HT013494180#!",
@@ -98,5 +98,9 @@
       "label" : "Illustrator"
     },
     "type" : [ "Contribution" ]
+  } ],
+  "fulltextOnline" : [ {
+    "id" : "https://nbn-resolving.org/urn:nbn:de:hbz:061:2-1602",
+    "label" : "urn:nbn:de:hbz:061:2-1602"
   } ]
 }