diff --git a/LICENSE b/LICENSE
index 4d20996..30f161c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022
+Copyright (c) 2022-2023 museum-digital
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 3f4030f..d8e8002 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,30 @@
 ## Formats covered thus far
 
 - `LIDO 1.0`
-  (Primary exchange export format)
+  (Primary exchange export format). See <https://lido-schema.org>
+- LIDO 1.1
+  Updated version of the LIDO standard, as of 2022. See <https://lido-schema.org>
+- EODEM
+  A LIDO profile (based on LIDO 1.1) specifically designed for the automation of the exchange of loan object information. Contrary to LIDO, it thus also covers some internal fields. See: <https://cidoc.mini.icom.museum/working-groups/documentation-standards/eodem-home/>
 
 ## Repository structure
 
-### /src
+### [/src](./src)
 
 Contains the relevant .xsl files used for converting md:xml to other formats.
 
-### /sample
+#### [/src/schemas](./src/schemas)
+
+This directory contains schemas for validating the different formats.
+
+#### [/src/selections](./src/selections)
+
+This directory contains JSON files listing which bits and pieces should be made available during an export from musdb when exporting to a given format. E.g., LIDO cannot represent internal information like insurance values. It thus does not make sense to export such information during the export to md:xml pre-transformation in the first place.
+
+### [/sample](./sample)
 
 Here you can find sample mx:xml files.
+
+## License
+
+This project is licensed under the MIT License. See the [LICENSE](./LICENSE) file for the full license text.
diff --git a/src/eodem-0.08.xsl b/src/eodem-0.08.xsl
index 6d1aabb..d08b190 100644
--- a/src/eodem-0.08.xsl
+++ b/src/eodem-0.08.xsl
@@ -34,70 +34,133 @@
                 </xsl:if>
                 <lido:objectClassificationWrap>
                     <lido:objectWorkTypeWrap>
-                        <lido:objectWorkType>
-                            <xsl:for-each select="objektart_gnd">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">gnd</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://d-nb.info/gnd/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_grobsystematik">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">grobsystematik</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/grobsystematik/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_oberbegriffsdatei">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">oberbegriffsdatei</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/oberbegriffsdatei/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_aat">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">aat</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://vocab.getty.edu/aat/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_lcsh">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">lcsh</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://id.loc.gov/authorities/subjects/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_md_tag">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">md:term</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/md-de/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:if test="objektart!=''">
-                                <xsl:for-each select="objektart">
-                                    <lido:term>
-                                        <xsl:attribute name="xml:lang">de</xsl:attribute>
-                                        <xsl:value-of select="." />
-                                    </lido:term>
-                                </xsl:for-each>
-                            </xsl:if>
-                            <xsl:if test="objekt_record_set/objektart!=''">
-                                <xsl:for-each select="objekt_record_set">
-                                    <xsl:if test="substring(objekt_record_weitergabe,1,1)=0">
-                                        <lido:term>
-                                            <xsl:attribute name="xml:lang">
-                                                <xsl:value-of select="objekt_record_lang" />
-                                            </xsl:attribute>
-                                            <xsl:value-of select="objektart" />
-                                        </lido:term>
+
+                       <xsl:choose>
+                           <xsl:when test="
+                           tagSet[0]/relation_type[. = 'object_type']
+                           | tagSet[1]/relation_type[. = 'object_type']
+                           | tagSet[2]/relation_type[. = 'object_type']
+                           | tagSet[3]/relation_type[. = 'object_type']
+                           | tagSet[4]/relation_type[. = 'object_type']
+                           | tagSet[5]/relation_type[. = 'object_type']
+                           | tagSet[6]/relation_type[. = 'object_type']
+                           | tagSet[7]/relation_type[. = 'object_type']
+                           | tagSet[8]/relation_type[. = 'object_type']
+                           | tagSet[9]/relation_type[. = 'object_type']
+                           | tagSet[10]/relation_type[. = 'object_type']
+                           | tagSet[11]/relation_type[. = 'object_type']
+                           | tagSet[12]/relation_type[. = 'object_type']
+                           | tagSet[13]/relation_type[. = 'object_type']
+                           | tagSet[14]/relation_type[. = 'object_type']
+                           | tagSet[15]/relation_type[. = 'object_type']
+                           | tagSet[16]/relation_type[. = 'object_type']
+                           | tagSet[17]/relation_type[. = 'object_type']
+                           | tagSet[18]/relation_type[. = 'object_type']
+                            ">
+
+                                <!-- objectWorkType exists via tags -->
+                                <xsl:for-each select="tagSet/tag_id">
+                                    <xsl:if test="../relation_type = 'object_type'">
+                                        <lido:objectWorkType>
+                                            <xsl:for-each select="../noda_tag_Set/noda_source">
+                                                <xsl:if test="string-length(../noda_link)!=0">
+                                                    <lido:conceptID>
+                                                        <xsl:attribute name="lido:source">
+                                                            <xsl:value-of select="../noda_source"/>
+                                                        </xsl:attribute>
+                                                        <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                                        <xsl:value-of select="../noda_link"/>
+                                                    </lido:conceptID>
+                                                    </xsl:if>
+                                            </xsl:for-each>
+                                            <xsl:for-each select="../tag_name">
+                                                <lido:term>
+                                                    <xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
+                                                    <xsl:if test="string-length(./@lang)!=0">
+                                                        <xsl:attribute name="xml:lang">
+                                                            <xsl:value-of select="./@lang"/>
+                                                        </xsl:attribute>
+                                                    </xsl:if>
+                                                    <xsl:value-of select="."/>
+                                                    <xsl:variable name="objektartschlagwort" select="." />
+                                                </lido:term>
+                                            </xsl:for-each>
+                                        </lido:objectWorkType>
                                     </xsl:if>
                                 </xsl:for-each>
-                            </xsl:if>
-                        </lido:objectWorkType>
+
+                          </xsl:when>
+                           <xsl:otherwise>
+
+                                <lido:objectWorkType>
+                                    <xsl:for-each select="objektart_gnd">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">gnd</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://d-nb.info/gnd/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_grobsystematik">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">grobsystematik</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/grobsystematik/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_oberbegriffsdatei">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">oberbegriffsdatei</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/oberbegriffsdatei/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_aat">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">aat</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://vocab.getty.edu/aat/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_lcsh">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">lcsh</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://id.loc.gov/authorities/subjects/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_md_tag">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">md:term</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/md-de/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:if test="objektart!=''">
+                                        <xsl:for-each select="objektart">
+                                            <lido:term>
+                                                <xsl:attribute name="xml:lang">de</xsl:attribute>
+                                                <xsl:value-of select="." />
+                                            </lido:term>
+                                        </xsl:for-each>
+                                    </xsl:if>
+                                    <xsl:if test="objekt_record_set/objektart!=''">
+                                        <xsl:for-each select="objekt_record_set">
+                                            <xsl:if test="substring(objekt_record_weitergabe,1,1)=0">
+                                                <lido:term>
+                                                    <xsl:attribute name="xml:lang">
+                                                        <xsl:value-of select="objekt_record_lang" />
+                                                    </xsl:attribute>
+                                                    <xsl:value-of select="objektart" />
+                                                </lido:term>
+                                            </xsl:if>
+                                        </xsl:for-each>
+                                    </xsl:if>
+                                </lido:objectWorkType>
+
+                           </xsl:otherwise>
+                       </xsl:choose>
+
+
                     </lido:objectWorkTypeWrap>
                     <lido:classificationWrap>
                         <xsl:for-each select="collectionSet">
diff --git a/src/lido-1.0.xsl b/src/lido-1.0.xsl
index 3fcf9fc..294649c 100644
--- a/src/lido-1.0.xsl
+++ b/src/lido-1.0.xsl
@@ -33,72 +33,135 @@
                 </xsl:if>
                 <lido:objectClassificationWrap>
                     <lido:objectWorkTypeWrap>
-                        <lido:objectWorkType>
-                            <xsl:for-each select="objektart_gnd">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">gnd</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://d-nb.info/gnd/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_grobsystematik">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">grobsystematik</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/grobsystematik/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_oberbegriffsdatei">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">oberbegriffsdatei</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/oberbegriffsdatei/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_aat">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">aat</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://vocab.getty.edu/aat/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_lcsh">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">lcsh</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://id.loc.gov/authorities/subjects/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_md_tag">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">md:term</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/md-de/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:if test="objektart!=''">
-                                <xsl:for-each select="objektart">
-                                    <lido:term>
-                                        <xsl:attribute name="xml:lang">de</xsl:attribute>
-                                        <xsl:value-of select="." />
-                                    </lido:term>
-                                </xsl:for-each>
-                            </xsl:if>
-                            <xsl:if test="objekt_record_set/objektart!=''">
-                                <xsl:for-each select="objekt_record_set">
-                                    <xsl:if test="substring(objekt_record_weitergabe,1,1)=0">
-                                        <lido:term>
-                                            <xsl:attribute name="xml:lang">
-                                                <xsl:value-of select="objekt_record_lang" />
-                                            </xsl:attribute>
-                                            <xsl:value-of select="objektart" />
-                                        </lido:term>
+
+                       <xsl:choose>
+                           <xsl:when test="
+                           tagSet[0]/relation_type[. = 'object_type']
+                           | tagSet[1]/relation_type[. = 'object_type']
+                           | tagSet[2]/relation_type[. = 'object_type']
+                           | tagSet[3]/relation_type[. = 'object_type']
+                           | tagSet[4]/relation_type[. = 'object_type']
+                           | tagSet[5]/relation_type[. = 'object_type']
+                           | tagSet[6]/relation_type[. = 'object_type']
+                           | tagSet[7]/relation_type[. = 'object_type']
+                           | tagSet[8]/relation_type[. = 'object_type']
+                           | tagSet[9]/relation_type[. = 'object_type']
+                           | tagSet[10]/relation_type[. = 'object_type']
+                           | tagSet[11]/relation_type[. = 'object_type']
+                           | tagSet[12]/relation_type[. = 'object_type']
+                           | tagSet[13]/relation_type[. = 'object_type']
+                           | tagSet[14]/relation_type[. = 'object_type']
+                           | tagSet[15]/relation_type[. = 'object_type']
+                           | tagSet[16]/relation_type[. = 'object_type']
+                           | tagSet[17]/relation_type[. = 'object_type']
+                           | tagSet[18]/relation_type[. = 'object_type']
+                            ">
+
+                                <!-- objectWorkType exists via tags -->
+                                <xsl:for-each select="tagSet/tag_id">
+                                    <xsl:if test="../relation_type = 'object_type'">
+                                        <lido:objectWorkType>
+                                            <xsl:for-each select="../noda_tag_Set/noda_source">
+                                                <xsl:if test="string-length(../noda_link)!=0">
+                                                    <lido:conceptID>
+                                                        <xsl:attribute name="lido:source">
+                                                            <xsl:value-of select="../noda_source"/>
+                                                        </xsl:attribute>
+                                                        <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                                        <xsl:value-of select="../noda_link"/>
+                                                    </lido:conceptID>
+                                                    </xsl:if>
+                                            </xsl:for-each>
+                                            <xsl:for-each select="../tag_name">
+                                                <lido:term>
+                                                    <xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
+                                                    <xsl:if test="string-length(./@lang)!=0">
+                                                        <xsl:attribute name="xml:lang">
+                                                            <xsl:value-of select="./@lang"/>
+                                                        </xsl:attribute>
+                                                    </xsl:if>
+                                                    <xsl:value-of select="."/>
+                                                    <xsl:variable name="objektartschlagwort" select="." />
+                                                </lido:term>
+                                            </xsl:for-each>
+                                        </lido:objectWorkType>
                                     </xsl:if>
                                 </xsl:for-each>
-                            </xsl:if>
-                        </lido:objectWorkType>
+
+                          </xsl:when>
+                           <xsl:otherwise>
+
+                                <lido:objectWorkType>
+                                    <xsl:for-each select="objektart_gnd">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">gnd</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://d-nb.info/gnd/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_grobsystematik">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">grobsystematik</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/grobsystematik/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_oberbegriffsdatei">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">oberbegriffsdatei</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/oberbegriffsdatei/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_aat">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">aat</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://vocab.getty.edu/aat/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_lcsh">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">lcsh</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://id.loc.gov/authorities/subjects/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_md_tag">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">md:term</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/md-de/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:if test="objektart!=''">
+                                        <xsl:for-each select="objektart">
+                                            <lido:term>
+                                                <xsl:attribute name="xml:lang">de</xsl:attribute>
+                                                <xsl:value-of select="." />
+                                            </lido:term>
+                                        </xsl:for-each>
+                                    </xsl:if>
+                                    <xsl:if test="objekt_record_set/objektart!=''">
+                                        <xsl:for-each select="objekt_record_set">
+                                            <xsl:if test="substring(objekt_record_weitergabe,1,1)=0">
+                                                <lido:term>
+                                                    <xsl:attribute name="xml:lang">
+                                                        <xsl:value-of select="objekt_record_lang" />
+                                                    </xsl:attribute>
+                                                    <xsl:value-of select="objektart" />
+                                                </lido:term>
+                                            </xsl:if>
+                                        </xsl:for-each>
+                                    </xsl:if>
+                                </lido:objectWorkType>
+
+                           </xsl:otherwise>
+                       </xsl:choose>
+
+
                     </lido:objectWorkTypeWrap>
-                    <lido:classificationWrap>
+                   <lido:classificationWrap>
                         <xsl:for-each select="collectionSet">
                             <lido:classification>
                                 <xsl:attribute name="lido:type">Sammlung</xsl:attribute>
@@ -861,7 +924,44 @@
                                             </lido:termMaterialsTech>
                                         </lido:materialsTech>
                                     </lido:eventMaterialsTech>
-                                </xsl:if> 
+                                </xsl:if>
+								
+						<xsl:for-each select="tagSet/tag_id">
+							<xsl:if test="../relation_type = 'material'">
+								<lido:eventMaterialsTech>
+									<lido:materialsTech>
+									<lido:termMaterialsTech lido:type="material">
+                                    <xsl:for-each select="../noda_tag_Set/noda_source">
+                                        <xsl:if test="string-length(../noda_link)!=0">
+                                            <lido:conceptID>
+                                                <xsl:attribute name="lido:source">
+                                                    <xsl:value-of select="../noda_source"/>
+                                                </xsl:attribute>
+                                                <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                                <xsl:value-of select="../noda_link"/>
+                                            </lido:conceptID>
+                                            </xsl:if>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="../tag_name">
+                                        <lido:term>
+                                            <xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
+                                            <xsl:if test="string-length(./@lang)!=0">
+                                                <xsl:attribute name="xml:lang">
+                                                    <xsl:value-of select="./@lang"/>
+                                                </xsl:attribute>
+                                            </xsl:if>
+                                            <xsl:value-of select="."/>
+                                        </lido:term>
+                                    </xsl:for-each>
+									</lido:termMaterialsTech>
+									</lido:materialsTech>
+								</lido:eventMaterialsTech>
+                            </xsl:if>
+						</xsl:for-each>
+								
+								
+								
+								
                                 <xsl:if test="technik2!=''">
                                     <lido:eventMaterialsTech>
                                         <lido:materialsTech>
@@ -872,8 +972,42 @@
                                             </lido:termMaterialsTech>
                                         </lido:materialsTech>
                                     </lido:eventMaterialsTech>
-                                </xsl:if> 
-                            </lido:event>
+                                </xsl:if>
+
+ 						<xsl:for-each select="tagSet/tag_id">
+							<xsl:if test="../relation_type = 'technique'">
+								<lido:eventMaterialsTech>
+									<lido:materialsTech>
+									<lido:termMaterialsTech lido:type="technique">
+                                    <xsl:for-each select="../noda_tag_Set/noda_source">
+                                        <xsl:if test="string-length(../noda_link)!=0">
+                                            <lido:conceptID>
+                                                <xsl:attribute name="lido:source">
+                                                    <xsl:value-of select="../noda_source"/>
+                                                </xsl:attribute>
+                                                <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                                <xsl:value-of select="../noda_link"/>
+                                            </lido:conceptID>
+                                            </xsl:if>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="../tag_name">
+                                        <lido:term>
+                                            <xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
+                                            <xsl:if test="string-length(./@lang)!=0">
+                                                <xsl:attribute name="xml:lang">
+                                                    <xsl:value-of select="./@lang"/>
+                                                </xsl:attribute>
+                                            </xsl:if>
+                                            <xsl:value-of select="."/>
+                                        </lido:term>
+                                    </xsl:for-each>
+									</lido:termMaterialsTech>
+									</lido:materialsTech>
+								</lido:eventMaterialsTech>
+                            </xsl:if>
+						</xsl:for-each>
+						
+                           </lido:event>
                         </lido:eventSet>
                     </xsl:if>
 
@@ -1191,39 +1325,40 @@
                         </xsl:if>					
 
                         <xsl:for-each select="tagSet/tag_id">
-                            <lido:subjectSet>
-                                <lido:subject>
-                                    <lido:subjectConcept>
-                                        <xsl:for-each select="../noda_tag_Set/noda_source">
-                                            <xsl:if test="string-length(../noda_link)!=0">
-                                                <lido:conceptID>
-                                                    <xsl:attribute name="lido:source">
-                                                        <xsl:value-of select="../noda_source"/>
-                                                    </xsl:attribute>
-                                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                                    <xsl:value-of select="../noda_link"/>
-                                                </lido:conceptID>
-                                            </xsl:if>
-                                        </xsl:for-each>
-                                        <xsl:for-each select="../tag_name">
-                                        <lido:term>
-                                            <xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
-                                            <xsl:if test="string-length(./@lang)!=0">
-                                                <xsl:attribute name="xml:lang">
-                                                    <xsl:value-of select="./@lang"/>
-                                                </xsl:attribute>
-                                            </xsl:if>
-                                            <xsl:value-of select="."/>
-                                        </lido:term>
+							<xsl:if test="(../relation_type != 'object_type') and (../relation_type != 'material') and (../relation_type != 'technique')">
+								<lido:subjectSet>
+									<lido:subject>
+										<lido:subjectConcept>
+											<xsl:for-each select="../noda_tag_Set/noda_source">
+												<xsl:if test="string-length(../noda_link)!=0">
+													<lido:conceptID>
+														<xsl:attribute name="lido:source">
+															<xsl:value-of select="../noda_source"/>
+														</xsl:attribute>
+														<xsl:attribute name="lido:type">uri</xsl:attribute>
+														<xsl:value-of select="../noda_link"/>
+													</lido:conceptID>
+												</xsl:if>
+											</xsl:for-each>
+											<xsl:for-each select="../tag_name">
+											<lido:term>
+												<xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
+												<xsl:if test="string-length(./@lang)!=0">
+													<xsl:attribute name="xml:lang">
+														<xsl:value-of select="./@lang"/>
+													</xsl:attribute>
+												</xsl:if>
+												<xsl:value-of select="."/>
+											</lido:term>
                                         </xsl:for-each>
                                     </lido:subjectConcept>
                                 </lido:subject>
                             </lido:subjectSet>
+							</xsl:if>
                         </xsl:for-each>
                     </lido:subjectWrap>
 
                     <lido:relatedWorksWrap>
-                    
                         <xsl:for-each select="vergleichsobjekte2">
                             <lido:relatedWorkSet>
                                 <lido:relatedWork>
diff --git a/src/lido-1.1.xsl b/src/lido-1.1.xsl
index f26abe9..28fe4ed 100644
--- a/src/lido-1.1.xsl
+++ b/src/lido-1.1.xsl
@@ -33,70 +33,133 @@
                 </xsl:if>
                 <lido:objectClassificationWrap>
                     <lido:objectWorkTypeWrap>
-                        <lido:objectWorkType>
-                            <xsl:for-each select="objektart_gnd">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">gnd</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://d-nb.info/gnd/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_grobsystematik">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">grobsystematik</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/grobsystematik/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_oberbegriffsdatei">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">oberbegriffsdatei</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/oberbegriffsdatei/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_aat">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">aat</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://vocab.getty.edu/aat/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_lcsh">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">lcsh</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('http://id.loc.gov/authorities/subjects/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:for-each select="objektart_md_tag">
-                                <lido:conceptID>
-                                    <xsl:attribute name="lido:source">md:term</xsl:attribute>
-                                    <xsl:attribute name="lido:type">uri</xsl:attribute>
-                                    <xsl:value-of select="concat('https://term.museum-digital.de/md-de/tag/', .)" />
-                                </lido:conceptID>
-                            </xsl:for-each>
-                            <xsl:if test="objektart!=''">
-                                <xsl:for-each select="objektart">
-                                    <lido:term>
-                                        <xsl:attribute name="xml:lang">de</xsl:attribute>
-                                        <xsl:value-of select="." />
-                                    </lido:term>
-                                </xsl:for-each>
-                            </xsl:if>
-                            <xsl:if test="objekt_record_set/objektart!=''">
-                                <xsl:for-each select="objekt_record_set">
-                                    <xsl:if test="substring(objekt_record_weitergabe,1,1)=0">
-                                        <lido:term>
-                                            <xsl:attribute name="xml:lang">
-                                                <xsl:value-of select="objekt_record_lang" />
-                                            </xsl:attribute>
-                                            <xsl:value-of select="objektart" />
-                                        </lido:term>
+
+                       <xsl:choose>
+                           <xsl:when test="
+                           tagSet[0]/relation_type[. = 'object_type']
+                           | tagSet[1]/relation_type[. = 'object_type']
+                           | tagSet[2]/relation_type[. = 'object_type']
+                           | tagSet[3]/relation_type[. = 'object_type']
+                           | tagSet[4]/relation_type[. = 'object_type']
+                           | tagSet[5]/relation_type[. = 'object_type']
+                           | tagSet[6]/relation_type[. = 'object_type']
+                           | tagSet[7]/relation_type[. = 'object_type']
+                           | tagSet[8]/relation_type[. = 'object_type']
+                           | tagSet[9]/relation_type[. = 'object_type']
+                           | tagSet[10]/relation_type[. = 'object_type']
+                           | tagSet[11]/relation_type[. = 'object_type']
+                           | tagSet[12]/relation_type[. = 'object_type']
+                           | tagSet[13]/relation_type[. = 'object_type']
+                           | tagSet[14]/relation_type[. = 'object_type']
+                           | tagSet[15]/relation_type[. = 'object_type']
+                           | tagSet[16]/relation_type[. = 'object_type']
+                           | tagSet[17]/relation_type[. = 'object_type']
+                           | tagSet[18]/relation_type[. = 'object_type']
+                            ">
+
+                                <!-- objectWorkType exists via tags -->
+                                <xsl:for-each select="tagSet/tag_id">
+                                    <xsl:if test="../relation_type = 'object_type'">
+                                        <lido:objectWorkType>
+                                            <xsl:for-each select="../noda_tag_Set/noda_source">
+                                                <xsl:if test="string-length(../noda_link)!=0">
+                                                    <lido:conceptID>
+                                                        <xsl:attribute name="lido:source">
+                                                            <xsl:value-of select="../noda_source"/>
+                                                        </xsl:attribute>
+                                                        <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                                        <xsl:value-of select="../noda_link"/>
+                                                    </lido:conceptID>
+                                                    </xsl:if>
+                                            </xsl:for-each>
+                                            <xsl:for-each select="../tag_name">
+                                                <lido:term>
+                                                    <xsl:attribute name="lido:addedSearchTerm">no</xsl:attribute>
+                                                    <xsl:if test="string-length(./@lang)!=0">
+                                                        <xsl:attribute name="xml:lang">
+                                                            <xsl:value-of select="./@lang"/>
+                                                        </xsl:attribute>
+                                                    </xsl:if>
+                                                    <xsl:value-of select="."/>
+                                                    <xsl:variable name="objektartschlagwort" select="." />
+                                                </lido:term>
+                                            </xsl:for-each>
+                                        </lido:objectWorkType>
                                     </xsl:if>
                                 </xsl:for-each>
-                            </xsl:if>
-                        </lido:objectWorkType>
+
+                          </xsl:when>
+                           <xsl:otherwise>
+
+                                <lido:objectWorkType>
+                                    <xsl:for-each select="objektart_gnd">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">gnd</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://d-nb.info/gnd/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_grobsystematik">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">grobsystematik</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/grobsystematik/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_oberbegriffsdatei">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">oberbegriffsdatei</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/oberbegriffsdatei/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_aat">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">aat</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://vocab.getty.edu/aat/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_lcsh">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">lcsh</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('http://id.loc.gov/authorities/subjects/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:for-each select="objektart_md_tag">
+                                        <lido:conceptID>
+                                            <xsl:attribute name="lido:source">md:term</xsl:attribute>
+                                            <xsl:attribute name="lido:type">uri</xsl:attribute>
+                                            <xsl:value-of select="concat('https://term.museum-digital.de/md-de/tag/', .)" />
+                                        </lido:conceptID>
+                                    </xsl:for-each>
+                                    <xsl:if test="objektart!=''">
+                                        <xsl:for-each select="objektart">
+                                            <lido:term>
+                                                <xsl:attribute name="xml:lang">de</xsl:attribute>
+                                                <xsl:value-of select="." />
+                                            </lido:term>
+                                        </xsl:for-each>
+                                    </xsl:if>
+                                    <xsl:if test="objekt_record_set/objektart!=''">
+                                        <xsl:for-each select="objekt_record_set">
+                                            <xsl:if test="substring(objekt_record_weitergabe,1,1)=0">
+                                                <lido:term>
+                                                    <xsl:attribute name="xml:lang">
+                                                        <xsl:value-of select="objekt_record_lang" />
+                                                    </xsl:attribute>
+                                                    <xsl:value-of select="objektart" />
+                                                </lido:term>
+                                            </xsl:if>
+                                        </xsl:for-each>
+                                    </xsl:if>
+                                </lido:objectWorkType>
+
+                           </xsl:otherwise>
+                       </xsl:choose>
+
+
                     </lido:objectWorkTypeWrap>
                     <lido:classificationWrap>
                         <xsl:for-each select="collectionSet">
diff --git a/src/selections/eodem-0.08.json b/src/selections/eodem-0.08.json
index 14c08aa..4a637db 100644
--- a/src/selections/eodem-0.08.json
+++ b/src/selections/eodem-0.08.json
@@ -9,6 +9,7 @@
     "show_markings": true,
     "show_transcripts": true,
     "show_links": true,
+    "show_object_to_object_links": true,
     "show_images": true,
     "show_hidden_images": false,
     "show_objekt_inventarnr": true,
diff --git a/src/selections/lido-1.0.json b/src/selections/lido-1.0.json
index 80fed66..4354191 100644
--- a/src/selections/lido-1.0.json
+++ b/src/selections/lido-1.0.json
@@ -9,6 +9,7 @@
     "show_markings": true,
     "show_transcripts": true,
     "show_links": true,
+    "show_object_to_object_links": true,
     "show_images": true,
     "show_hidden_images": false,
     "show_objekt_inventarnr": true,
diff --git a/src/selections/lido-1.1.json b/src/selections/lido-1.1.json
index fffe9c6..4324567 100644
--- a/src/selections/lido-1.1.json
+++ b/src/selections/lido-1.1.json
@@ -9,6 +9,7 @@
     "show_markings": true,
     "show_transcripts": true,
     "show_links": true,
+    "show_object_to_object_links": true,
     "show_images": true,
     "show_hidden_images": false,
     "show_objekt_inventarnr": true,