diff --git a/personenregister.odd b/personenregister.odd
index 4df82d566dd85c7f11962704b0fd552cf68f6d1b..1ec768aa05cbfe71012552e84d86ca91f8f95fcf 100644
--- a/personenregister.odd
+++ b/personenregister.odd
@@ -685,9 +685,8 @@ document('../Register/register-org/register-org-xyz.xml')//*[@xml:id eq $orgid]
                         </rng:oneOrMore>
                         <rng:oneOrMore>
                             <rng:ref name="listBibl"/>
-                        </rng:oneOrMore>
-                        <rng:zeroOrMore>
-                            <rng:choice>
+                        </rng:oneOrMore>                        
+                        <rng:interleave>                            
                                 <rng:group>
                                     <rng:optional>
                                         <rng:ref name="birth"/>
@@ -696,13 +695,12 @@ document('../Register/register-org/register-org-xyz.xml')//*[@xml:id eq $orgid]
                                         <rng:ref name="death"/>
                                     </rng:optional>
                                 </rng:group>
-                                <rng:ref name="floruit"/>
-                                <rng:ref name="linkGrp"/>
-                                <rng:ref name="note"/>
-                                <rng:ref name="occupation"/>
-                                <rng:ref name="faith"/>
-                            </rng:choice>
-                        </rng:zeroOrMore>
+                                <rng:optional><rng:ref name="floruit"/></rng:optional>
+                                <rng:optional><rng:ref name="linkGrp"/></rng:optional>
+                                <rng:zeroOrMore><rng:ref name="note"/></rng:zeroOrMore>
+                                <rng:zeroOrMore><rng:ref name="occupation"/></rng:zeroOrMore>
+                                <rng:zeroOrMore><rng:ref name="faith"/></rng:zeroOrMore>                            
+                        </rng:interleave>
 
                         <rng:optional>
                             <rng:ref name="listBibl"/>