diff --git a/diploma.yaml b/diploma.yaml
index 4f72525..9706ee9 100644
--- a/diploma.yaml
+++ b/diploma.yaml
@@ -29,6 +29,15 @@ nodes:
             en-eu: "Date of Announcement"
       "student": &student-payload
         viewers: *view-minimal
+        future-viewers: &view-alle
+          - *PAmt
+          - *PAvor-I
+          - *PAvor-MI
+          - *Dek
+          - *Sek-I
+          - *Sek-MI1
+          - *Sek-MI2
+          - *student
         display-label: 
           fallback: "Student:in"
           fallback-lang: de-de-formal
@@ -44,13 +53,16 @@ nodes:
             en-eu: "Subject"
       "kommunikation": &kommunikation-payload
         viewers: *view-minimal
+        future-viewers: *view-alle
         display-label: 
           fallback: "Kommunikation"
           fallback-lang: de-de-formal
           translations:
             en-eu: "Communication"
       "notizen":
-        viewers: &view-internal
+        viewers:
+          - *PAmt
+        future-viewers: &view-internal
           - *PAmt
           - &PAvor-I  # Prüfungsausschussvorsitz Informatik
             tag: user
@@ -77,6 +89,7 @@ nodes:
             en-eu: "Internal Notes"
       "variante": &variante-payload
         viewers: *view-minimal
+        future-viewers: *view-alle
         display-label: 
           fallback: "Abschluss"
           fallback-lang: de-de-formal
@@ -123,14 +136,14 @@ nodes:
       "zeugnisscan":
         viewers: *view-internal
         display-label: 
-          fallback: "Abschlußzeugnis (Scan)"
+          fallback: "Abschlusszeugnis (Scan)"
           fallback-lang: de-de-formal
           translations:
             en-eu: "Diploma (scanned)"
       "vorlaeufiges zeugnis":
         viewers: *view-minimal
         display-label: 
-          fallback: "Vorläufiges Abschlußzeugnis"
+          fallback: "Vorläufiges Abschlusszeugnis"
           fallback-lang: de-de-formal
           translations:
             en-eu: "Preliminary Diploma"
@@ -138,12 +151,13 @@ nodes:
         viewers: 
           - *PAmt
         display-label: 
-          fallback: "Abschlußmeldung an Studentenkanzlei"
+          fallback: "Abschlussmeldung an Studentenkanzlei"
           fallback-lang: de-de-formal
           translations:
             en-eu: "Closing Report to Student Office"
       "zustimmung": &zustimmung-payload
         viewers: *view-minimal
+        future-viewers: *view-alle
         display-label:
           fallback: "Zustimmung zur Zeugniserstellung"
           fallback-lang: de-de-formal
@@ -882,15 +896,7 @@ nodes:
       <<: *payload-view
       "student":
         <<: *student-payload
-        viewers: &view-alle
-          - *PAmt
-          - *PAvor-I
-          - *PAvor-MI
-          - *Dek
-          - *Sek-I
-          - *Sek-MI1
-          - *Sek-MI2
-          - *student
+        viewers: *view-alle
       "kommunikation":
         <<: *kommunikation-payload
         viewers: *view-alle