diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml
index 44719e07e..2b3d758c0 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml
@@ -60,6 +60,8 @@
     <line id="discussingPublications/heading">Wird in folgenden Publikationen behandelt</line>
     <line id="discussedPublications/heading">Behandelt folgende Publikationen</line>
     <line id="librarySignatures/heading">Bibliotheken</line>
+    
+    <line id="assignedTerms">Schlüsselwörter</line>
 
     <line id="articleInCollectedVolume/abstract">Zusammenfassung</line>
     <line id="articleInCollectedVolume/authors">Autorinnen/Autoren</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml
index eb1ede074..abb221fa5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml
@@ -55,6 +55,8 @@
     <line id="BibTeX">BibTeX</line>
     <line id="RIS">RIS</line>
   
+    <line id="assignedTerms">Keywords</line>
+
     <line id="librarySignatures/heading">Libraries</line>
 
     <line id="articleInCollectedVolume/abstract">Abstract</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
index a04b6a3b6..031b255b3 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
@@ -31,6 +31,9 @@
     <setting id="formatDefFile">SciPublicationsDefaultFormat.xml</setting>
 
     <setting id="detailView/linkAuthors">true</setting>
+    <setting id="detailView/domainsToShow">
+        <!--<domain>LIB-KEYWORDS</domain>-->
+    </setting>
 
     <setting id="listView/setLinkToDetails">false</setting>
     <setting id="listView/setLeadText">true</setting>
@@ -59,6 +62,7 @@
 
     <setting id="articleInCollectedVolume/setAbstract">true</setting>
     <setting id="articleInCollectedVolume/setAuthors">true</setting>
+    <setting id="articleInCollectedVolume/setAssignedTerms">true</setting>
     <setting id="articleInCollectedVolume/setChapter">true</setting>
     <setting id="articleInCollectedVolume/setCollectedVolume">true</setting>
     <setting id="articleInCollectedVolume/setIsbn">true</setting>
@@ -81,6 +85,7 @@
     <setting id="articleInJournal/setImageMaxWidth"></setting>
 
     <setting id="articleInJournal/setAbstract">true</setting>
+    <setting id="articleInJournal/setAssignedTerms">true</setting>
     <setting id="articleInJournal/setAuthors">true</setting>
     <setting id="articleInJournal/setIssn">true</setting>
     <setting id="articleInJournal/setIssue">true</setting>
@@ -102,6 +107,7 @@
 
     <setting id="collectedVolume/setAbstract">true</setting>
     <setting id="collectedVolume/setArticles">true</setting>
+    <setting id="collectedVolume/setAssignedTerms">true</setting>
     <setting id="collectedVolume/setAuthors">true</setting>
     <setting id="collectedVolume/setEdition">true</setting>
     <setting id="collectedVolume/setIsbn">true</setting>
@@ -126,6 +132,7 @@
     <setting id="expertise/setImageMaxWidth"></setting>
 
     <setting id="expertise/setAbstract">true</setting>
+    <setting id="expertise/setAssignedTerms">true</setting>
     <setting id="expertise/setAutors">true</setting>
     <setting id="expertise/setLanguageOfPublication">true</setting>
     <setting id="expertise/setMisc">true</setting>
@@ -147,6 +154,7 @@
     <setting id="greyLiterature/setImageMaxWidth"></setting>
 
     <setting id="greyLiterature/setAbstract">true</setting>
+    <setting id="greyLiterature/setAssignedTerms">true</setting>
     <setting id="greyLiterature/setAuthors">true</setting>
     <setting id="greyLiterature/setLanguageOfPublication">true</setting>
     <setting id="greyLiterature/setMisc">true</setting>
@@ -169,6 +177,7 @@
     <setting id="inProceedings/setImageMaxWidth"></setting>
 
     <setting id="inProceedings/setAbstract">true</setting>
+    <setting id="inProceedings/setAssignedTerms">true</setting>
     <setting id="inProceedings/setAuthors">true</setting>
     <setting id="inProceedings/setLanguageOfPublication">true</setting>
     <setting id="inProceedings/setMisc">true</setting>
@@ -188,6 +197,7 @@
     <setting id="internetArticle/setImageMaxWidth"></setting>
 
     <setting id="internetArticle/setAbstract">true</setting>
+    <setting id="internetArticle/setAssignedTerms">true</setting>
     <setting id="internetArticle/setAuthors">true</setting>
     <setting id="internetArticle/setEdition">true</setting>
     <setting id="internetArticle/setIssn">true</setting>
@@ -218,6 +228,7 @@
     <setting id="monograph/setImageMaxWidth"></setting>
 
     <setting id="monograph/setAbstract">true</setting>
+    <setting id="monograph/setAssignedTerms">true</setting>
     <setting id="monograph/setAuthors">true</setting>
     <setting id="monograph/setEdition">true</setting>
     <setting id="monograph/setIsbn">true</setting>
@@ -242,6 +253,7 @@
     <setting id="proceedings/setImageMaxWidth"></setting>
 
     <setting id="proceedings/setAbstract">true</setting>
+    <setting id="proceedings/setAssignedTerms">true</setting>
     <setting id="proceedings/setAuthors">true</setting>
     <setting id="proceedings/setDateOfConference">true</setting>
     <setting id="proceedings/setIsbn">true</setting>
@@ -267,6 +279,7 @@
     <setting id="review/setImageMaxWidth"></setting>
 
     <setting id="review/setAbstract">true</setting>
+    <setting id="review/setAssignedTerms">true</setting>
     <setting id="review/setAuthors">true</setting>
     <setting id="review/setIssn">true</setting>
     <setting id="review/setIssue">true</setting>
@@ -297,6 +310,7 @@
     <setting id="workingPaper/setImageMaxWidth"></setting>
 
     <setting id="workingPaper/setAbstract">true</setting>
+    <setting id="workingPaper/setAssignedTerms">true</setting>
     <setting id="workingPaper/setAuthors">true</setting>
     <setting id="workingPaper/setLanguageOfPublication">true</setting>
     <setting id="workingPaper/setMisc">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
index 98872faef..e954a32de 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
@@ -121,6 +121,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'articleInCollectedVolume/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -422,6 +429,17 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
index 4046e1760..eb10e0079 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
@@ -114,6 +114,13 @@
                 <xsl:with-param name="default" select="'true'"/>
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'articleInJournal/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'"/>
@@ -397,6 +404,17 @@
                         <xsl:value-of select="./publicationDate/@date"/>
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
index 49829eee8..b9cd8a68b 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
@@ -111,6 +111,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'collectedVolume/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setArticles">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -453,6 +460,17 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
    
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
@@ -516,8 +534,6 @@
             <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl" />
         </xsl:call-template>
     </xsl:template>
-    
-    
     <xsl:template name="CT_CollectedVolume_List" match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.CollectedVolume']" mode="list_view">
         <xsl:param name="useRelativeUrl" select="'false'" />
         <xsl:variable name="formatDefFile">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
index e86da4b7e..d5f48c012 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
@@ -111,6 +111,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'expertise/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -372,6 +379,17 @@
                         <xsl:value-of select="./organization/title" />
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
index 544fe15fa..6d7af6b00 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
@@ -111,6 +111,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'greyLiterature/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -398,6 +405,17 @@
                             </xsl:otherwise>
                         </xsl:choose>
                     </dd>
+                    <xsl:if test="$setAssignedTerms = 'true'">
+                        <dt>
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'SciPublications'"/>
+                                <xsl:with-param name="id" select="'assignedTerms'" />
+                            </xsl:call-template>
+                        </dt>
+                        <dd>
+                            <xsl:call-template name="scipublications_assigned_terms"/>
+                        </dd>
+                    </xsl:if>
                 </xsl:if>
             </dl>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
index 9abbe6aa3..5454858bc 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
@@ -111,6 +111,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'inProceedings/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -328,6 +335,17 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
index fe325ae73..87d03663a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
@@ -114,6 +114,13 @@
                 <xsl:with-param name="default" select="'true'"/>
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'internetArticle/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'"/>
@@ -417,6 +424,17 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
index e96baf3f5..f79e5b082 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
@@ -111,6 +111,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'monograph/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -437,6 +444,19 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                        
+                    
+                    </dd>
+                </xsl:if>
             </dl>
    
             <xsl:if test="($setAbstract = 'true') and (string-length(normalize-space(./abstract)) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
index 901137f08..692102bc4 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
@@ -111,6 +111,13 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'proceedings/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -495,6 +502,17 @@
                             </xsl:otherwise>
                         </xsl:choose>
                     </dd>
+                    <xsl:if test="$setAssignedTerms = 'true'">
+                        <dt>
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'SciPublications'"/>
+                                <xsl:with-param name="id" select="'assignedTerms'" />
+                            </xsl:call-template>
+                        </dt>
+                        <dd>
+                            <xsl:call-template name="scipublications_assigned_terms"/>
+                        </dd>
+                    </xsl:if>
                 </xsl:if>
             </dl>
    
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
index 2d743e1a2..ac5580cdb 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
@@ -104,8 +104,8 @@
     </xsl:template>
 
     <xsl:template name="CT_ResearchReport_graphics"
-                match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']"
-                mode="detailed_view">
+                  match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']"
+                  mode="detailed_view">
     
         <xsl:variable name="setAbstract">
             <xsl:call-template name="mandalay:getSetting">
@@ -114,6 +114,13 @@
                 <xsl:with-param name="default" select="'true'"/>
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'researchReport/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'"/>
@@ -360,7 +367,17 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
-
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
@@ -401,7 +418,7 @@
         =========
     -->
     <xsl:template match="publications[objectType='com.arsdigita.cms.contenttypes.ResearchReport']"
-                mode="list_view">
+                  mode="list_view">
         <xsl:param name="useRelativeUrl" select="'false'"/>
         <xsl:call-template name="CT_ResearchReport_List">
             <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl"/>
@@ -409,7 +426,7 @@
     </xsl:template>
 
     <xsl:template match="publication[objectType='com.arsdigita.cms.contenttypes.ResearchReport']"
-                mode="list_view">
+                  mode="list_view">
         <xsl:param name="useRelativeUrl" select="'false'"/>
         <xsl:call-template name="CT_ResearchReport_List">
             <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
index ae8bd3080..096e4d4a7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
@@ -114,6 +114,13 @@
                 <xsl:with-param name="default" select="'true'"/>
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'review/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setAuthors">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'"/>
@@ -347,6 +354,18 @@
                         <xsl:value-of select="./publicationDate"/>
                     </dd>
                 </xsl:if>
+                
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
index ba66128ed..6e3900fb1 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
@@ -307,7 +307,7 @@
       
             <ul>
                 <xsl:for-each select="./volumes/publication">
-                    <xsl:sort select="./@volumeNr" data-type="number" order="descending"/>
+                    <xsl:sort select="./@volume" data-type="number" order="descending"/>
                     <xsl:sort select="./yearOfPublication" data-type="number" order="descending"/>
                     <xsl:sort select="./title" data-type="text"/>
                     <li>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
index 15b7bbde6..e76024cbd 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
@@ -113,6 +113,13 @@
                 <xsl:with-param name="default" select="'true'"/>	
             </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="setAssignedTerms">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciPublications'" />
+                <xsl:with-param name="setting" select="'workingPaper/setAssignedTerms'" />
+                <xsl:with-param name="default" select="'false'" />
+            </xsl:call-template>
+        </xsl:variable>
         <xsl:variable name="setLanguageOfPublication">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
@@ -359,7 +366,17 @@
                         </xsl:choose>
                     </dd>
                 </xsl:if>
-
+                <xsl:if test="$setAssignedTerms = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciPublications'"/>
+                            <xsl:with-param name="id" select="'assignedTerms'" />
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:call-template name="scipublications_assigned_terms"/>
+                    </dd>
+                </xsl:if>
             </dl>
 
             <xsl:if test="($setAbstract = 'true') and (string-length(./abstract) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
index ab098ce3b..3989e59ee 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
@@ -26,8 +26,9 @@
     xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
     xmlns:nav="http://ccm.redhat.com/navigation"
     xmlns:cms="http://www.arsdigita.com/cms/1.0"
+    xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
     xmlns:mandalay="http://mandalay.quasiweb.de"
-    exclude-result-prefixes="xsl bebop cms nav"
+    exclude-result-prefixes="xsl bebop cms nav terms"
     version="1.0">
 
     <!-- 
@@ -41,15 +42,15 @@
          List view of publications (basic type)
     -->
     <xsl:template name="CT_Publication_List"
-                match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.Publication']"
-                mode="list_view">
+                  match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.Publication']"
+                  mode="list_view">
         <!-- DE Hole alle benötigten Einstellungen -->
         <!-- EN Get all settings needed -->
         <xsl:variable name="setLinkToDetails">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setLinkToDetails'" />
+                                select="'listView/setLinkToDetails'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -57,7 +58,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setLeadText'" />
+                                select="'listView/setLeadText'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -65,7 +66,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setLeadTextLength'" />
+                                select="'listView/setLeadTextLength'" />
                 <xsl:with-param name="default" select="'0'" />
             </xsl:call-template>
         </xsl:variable>
@@ -73,7 +74,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setMoreButton'" />
+                                select="'listView/setMoreButton'" />
                 <xsl:with-param name="default" select="'false'" />
             </xsl:call-template>
         </xsl:variable>
@@ -96,7 +97,7 @@
                     <xsl:call-template name="mandalay:shying">
                         <xsl:with-param name="title">
                             <xsl:value-of disable-output-escaping="yes"
-                            select="nav:attribute[@name='title']" />
+                                          select="nav:attribute[@name='title']" />
                         </xsl:with-param>
                         <xsl:with-param name="mode">dynamic</xsl:with-param>
                     </xsl:call-template>
@@ -104,7 +105,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of disable-output-escaping="yes"
-                      select="nav:attribute[@name='title']" />
+                              select="nav:attribute[@name='title']" />
             </xsl:otherwise>
         </xsl:choose>
         <xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
@@ -113,11 +114,11 @@
                 <xsl:choose>
                     <xsl:when test="$setLeadTextLength = '0'">
                         <xsl:value-of disable-output-escaping="yes"
-                          select="nav:attribute[@name='lead']" />
+                                      select="nav:attribute[@name='lead']" />
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of disable-output-escaping="yes"
-                          select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
+                                      select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
                         <xsl:if test="string-length(nav:attribute[@name='lead']) &gt; $setLeadTextLength">
                             <xsl:text>...</xsl:text>
                             <xsl:if test="$setMoreButton = 'true'">
@@ -129,16 +130,16 @@
                                         <xsl:attribute name="title">
                                             <xsl:call-template name="mandalay:getStaticText">
                                                 <xsl:with-param name="module"
-                                        select="'SciPublications'" />
+                                                                select="'SciPublications'" />
                                                 <xsl:with-param name="id"
-                                        select="'moreButtonTitle'" />
+                                                                select="'moreButtonTitle'" />
                                             </xsl:call-template>
                                         </xsl:attribute>
                                         <xsl:call-template name="mandalay:getStaticText">
                                             <xsl:with-param name="module"
-                                      select="'SciPublications'" />
+                                                            select="'SciPublications'" />
                                             <xsl:with-param name="id"
-                                      select="'moreButton'" />
+                                                            select="'moreButton'" />
                                         </xsl:call-template>
                                     </a>
                                 </span>
@@ -154,8 +155,8 @@
         List view of publications with publisher
     -->
     <xsl:template name="CT_PublicationWithPublisher_List"
-                match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.PublicationWithPublisher']"
-                mode="list_view">
+                  match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.PublicationWithPublisher']"
+                  mode="list_view">
         <!-- Simply call template for Publications, because there is not difference for list view between these
         two types -->
         <xsl:call-template name="CT_Publication_List" />
@@ -163,43 +164,43 @@
 
     <!-- List view of a publisher -->
     <xsl:template name="CT_Publisher_List"
-                match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.Publisher']"
-                mode="list_view">
+                  match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.Publisher']"
+                  mode="list_view">
         <!-- DE Hole alle benötigten Einstellungen -->
         <!-- EN Get all settings needed -->
         <xsl:variable name="setLinkToDetails">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setLinkToDetails'" />
+                                select="'listView/setLinkToDetails'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setLeadText">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setLeadText'" />
+                                select="'listView/setLeadText'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setLeadTextLength">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setLeadTextLength'" />
+                                select="'listView/setLeadTextLength'" />
                 <xsl:with-param name="default" select="'0'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setMoreButton">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'listView/setMoreButton'" />
+                                select="'listView/setMoreButton'" />
                 <xsl:with-param name="default" select="'false'" />
             </xsl:call-template>
         </xsl:variable>
@@ -221,7 +222,7 @@
                     <xsl:call-template name="mandalay:shying">
                         <xsl:with-param name="title">
                             <xsl:value-of disable-output-escaping="yes"
-                            select="nav:attribute[@name='title']" />
+                                          select="nav:attribute[@name='title']" />
                         </xsl:with-param>
                         <xsl:with-param name="mode">dynamic</xsl:with-param>
                     </xsl:call-template>
@@ -229,7 +230,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of disable-output-escaping="yes"
-                      select="nav:attribute[@name='title']" />
+                              select="nav:attribute[@name='title']" />
             </xsl:otherwise>
         </xsl:choose>
         <xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
@@ -238,11 +239,11 @@
                 <xsl:choose>
                     <xsl:when test="$setLeadTextLength = '0'">
                         <xsl:value-of disable-output-escaping="yes"
-                          select="nav:attribute[@name='lead']" />
+                                      select="nav:attribute[@name='lead']" />
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of disable-output-escaping="yes"
-                          select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
+                                      select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
                         <xsl:if test="string-length(nav:attribute[@name='lead']) &gt; $setLeadTextLength">
                             <xsl:text>...</xsl:text>
                             <xsl:if test="$setMoreButton = 'true'">
@@ -255,17 +256,17 @@
                                             <xsl:call-template name="mandalay:getStaticText">
 
                                                 <xsl:with-param name="module"
-                                        select="'SciPublications_Publisher'" />
+                                                                select="'SciPublications_Publisher'" />
                                                 <xsl:with-param name="id"
-                                        select="'moreButtonTitle'" />
+                                                                select="'moreButtonTitle'" />
                                             </xsl:call-template>
                                         </xsl:attribute>
                                         <xsl:call-template name="mandalay:getStaticText">
 
                                             <xsl:with-param name="module"
-                                      select="'SciPublications_Publisher'" />
+                                                            select="'SciPublications_Publisher'" />
                                             <xsl:with-param name="id"
-                                      select="'moreButton'" />
+                                                            select="'moreButton'" />
                                         </xsl:call-template>
                                     </a>
                                 </span>
@@ -279,15 +280,15 @@
 
     <!-- Link view for publications -->
     <xsl:template name="CT_Publication_Link"
-                match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Publication']"
-                mode="link_view">
+                  match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Publication']"
+                  mode="link_view">
         <!-- DE Hole alle benötigten Einstellungen-->
         <!-- EN Getting all needed setting-->
         <xsl:variable name="setLinkToDetails">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setLinkToDetails'" />
+                                select="'linkView/setLinkToDetails'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -295,7 +296,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageAndText'" />
+                                select="'linkView/setImageAndText'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -303,7 +304,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImage'" />
+                                select="'linkView/setImage'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -311,7 +312,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageMaxHeight'" />
+                                select="'linkView/setImageMaxHeight'" />
                 <xsl:with-param name="default" select="''" />
             </xsl:call-template>
         </xsl:variable>
@@ -319,7 +320,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageMaxWidth'" />
+                                select="'linkView/setImageMaxWidth'" />
                 <xsl:with-param name="default" select="''" />
             </xsl:call-template>
         </xsl:variable>
@@ -327,7 +328,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageCaption'" />
+                                select="'linkView/setImageCaption'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -335,7 +336,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setDescription'" />
+                                select="'linkView/setDescription'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
@@ -343,7 +344,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setDescriptionLength'" />
+                                select="'linkView/setDescriptionLength'" />
                 <xsl:with-param name="default" select="'0'" />
             </xsl:call-template>
         </xsl:variable>
@@ -351,7 +352,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setMoreButton'" />
+                                select="'linkView/setMoreButton'" />
                 <xsl:with-param name="default" select="'false'" />
             </xsl:call-template>
         </xsl:variable>
@@ -379,11 +380,11 @@
                         <xsl:for-each select="./targetItem">
                             <xsl:call-template name="mandalay:imageAttachment">
                                 <xsl:with-param name="showCaption"
-                                select="$setImageCaption" />
+                                                select="$setImageCaption" />
                                 <xsl:with-param name="maxHeight"
-                                select="$setImageMaxHeight" />
+                                                select="$setImageMaxHeight" />
                                 <xsl:with-param name="maxWidth"
-                                select="$setImageMaxWidth" />
+                                                select="$setImageMaxWidth" />
                             </xsl:call-template>
                         </xsl:for-each>
                     </a>
@@ -392,11 +393,11 @@
                     <xsl:for-each select="./targetItem">
                         <xsl:call-template name="mandalay:imageAttachment">
                             <xsl:with-param name="showCaption"
-                              select="$setImageCaption" />
+                                            select="$setImageCaption" />
                             <xsl:with-param name="maxHeight"
-                              select="$setImageMaxHeight" />
+                                            select="$setImageMaxHeight" />
                             <xsl:with-param name="maxWidth"
-                              select="$setImageMaxWidth" />
+                                            select="$setImageMaxWidth" />
                         </xsl:call-template>
                     </xsl:for-each>
                 </xsl:otherwise>
@@ -423,7 +424,7 @@
                         <xsl:call-template name="mandalay:shying">
                             <xsl:with-param name="title">
                                 <xsl:value-of disable-output-escaping="yes"
-                              select="./linkTitle" />
+                                              select="./linkTitle" />
                             </xsl:with-param>
                             <xsl:with-param name="mode">dynamic</xsl:with-param>
                         </xsl:call-template>
@@ -437,7 +438,7 @@
                         <xsl:call-template name="mandalay:shying">
                             <xsl:with-param name="title">
                                 <xsl:value-of disable-output-escaping="yes"
-                              select="./linkTitle" />
+                                              select="./linkTitle" />
                             </xsl:with-param>
                             <xsl:with-param name="mode">dynamic</xsl:with-param>
                         </xsl:call-template>
@@ -449,11 +450,11 @@
                 <xsl:choose>
                     <xsl:when test="$setDescriptionLength = '0'">
                         <xsl:value-of disable-output-escaping="yes"
-                          select="./linkDescription" />
+                                      select="./linkDescription" />
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of disable-output-escaping="yes"
-                          select="substring(./linkDescription, 1, $setDescriptionLength)" />
+                                      select="substring(./linkDescription, 1, $setDescriptionLength)" />
                         <xsl:if test="string-length(./linkDescription) &gt; $setDescriptionLength">
                             <xsl:text>...</xsl:text>
                             <xsl:if test="$setMoreButton = 'true'">
@@ -466,17 +467,17 @@
                                             <xsl:call-template name="mandalay:getStaticText">
 
                                                 <xsl:with-param name="module"
-                                        select="'SciPublications'" />
+                                                                select="'SciPublications'" />
                                                 <xsl:with-param name="id"
-                                        select="'moreButtonTitle'" />
+                                                                select="'moreButtonTitle'" />
                                             </xsl:call-template>
                                         </xsl:attribute>
                                         <xsl:call-template name="mandalay:getStaticText">
 
                                             <xsl:with-param name="module"
-                                      select="'SciPublications'" />
+                                                            select="'SciPublications'" />
                                             <xsl:with-param name="id"
-                                      select="'moreButton'" />
+                                                            select="'moreButton'" />
                                         </xsl:call-template>
                                     </a>
                                 </span>
@@ -491,8 +492,8 @@
 
     <!-- Link view for publications with publisher -->
     <xsl:template name="CT_PublicationWithPublisher_Link"
-                match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.PublicationWithPublisher']"
-                mode="link_view">
+                  match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.PublicationWithPublisher']"
+                  mode="link_view">
         <!-- Simply call template for Publications, because there is not difference for list view between these
         two types -->
         <xsl:call-template name="CT_Publication_Link" />
@@ -500,88 +501,88 @@
 
     <!-- Link view for publishers -->
     <xsl:template name="CT_Publisher_Link"
-                match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Publisher']"
-                mode="link_view">
+                  match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Publisher']"
+                  mode="link_view">
         <!-- DE Hole alle benötigten Einstellungen-->
         <!-- EN Getting all needed setting-->
         <xsl:variable name="setLinkToDetails">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setLinkToDetails'" />
+                                select="'linkView/setLinkToDetails'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setImageAndText">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageAndText'" />
+                                select="'linkView/setImageAndText'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setImage">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImage'" />
+                                select="'linkView/setImage'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setImageMaxHeight">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageMaxHeight'" />
+                                select="'linkView/setImageMaxHeight'" />
                 <xsl:with-param name="default" select="''" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setImageMaxWidth">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageMaxWidth'" />
+                                select="'linkView/setImageMaxWidth'" />
                 <xsl:with-param name="default" select="''" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setImageCaption">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setImageCaption'" />
+                                select="'linkView/setImageCaption'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setDescription">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setDescription'" />
+                                select="'linkView/setDescription'" />
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setDescriptionLength">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setDescriptionLength'" />
+                                select="'linkView/setDescriptionLength'" />
                 <xsl:with-param name="default" select="'0'" />
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="setMoreButton">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"
-                        select="'SciPublications_Publisher'" />
+                                select="'SciPublications_Publisher'" />
                 <xsl:with-param name="setting"
-                        select="'linkView/setMoreButton'" />
+                                select="'linkView/setMoreButton'" />
                 <xsl:with-param name="default" select="'false'" />
             </xsl:call-template>
         </xsl:variable>
@@ -609,11 +610,11 @@
                         <xsl:for-each select="./targetItem">
                             <xsl:call-template name="mandalay:imageAttachment">
                                 <xsl:with-param name="showCaption"
-                                select="$setImageCaption" />
+                                                select="$setImageCaption" />
                                 <xsl:with-param name="maxHeight"
-                                select="$setImageMaxHeight" />
+                                                select="$setImageMaxHeight" />
                                 <xsl:with-param name="maxWidth"
-                                select="$setImageMaxWidth" />
+                                                select="$setImageMaxWidth" />
                             </xsl:call-template>
                         </xsl:for-each>
                     </a>
@@ -622,11 +623,11 @@
                     <xsl:for-each select="./targetItem">
                         <xsl:call-template name="mandalay:imageAttachment">
                             <xsl:with-param name="showCaption"
-                              select="$setImageCaption" />
+                                            select="$setImageCaption" />
                             <xsl:with-param name="maxHeight"
-                              select="$setImageMaxHeight" />
+                                            select="$setImageMaxHeight" />
                             <xsl:with-param name="maxWidth"
-                              select="$setImageMaxWidth" />
+                                            select="$setImageMaxWidth" />
                         </xsl:call-template>
                     </xsl:for-each>
                 </xsl:otherwise>
@@ -652,7 +653,7 @@
                         <xsl:call-template name="mandalay:shying">
                             <xsl:with-param name="title">
                                 <xsl:value-of disable-output-escaping="yes"
-                              select="./linkTitle" />
+                                              select="./linkTitle" />
                             </xsl:with-param>
                             <xsl:with-param name="mode">dynamic</xsl:with-param>
                         </xsl:call-template>
@@ -675,7 +676,7 @@
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of disable-output-escaping="yes"
-                          select="substring(./linkDescription, 1, $setDescriptionLength)" />
+                                      select="substring(./linkDescription, 1, $setDescriptionLength)" />
                         <xsl:if test="string-length(./linkDescription) &gt; $setDescriptionLength">
                             <xsl:text>...</xsl:text>
                             <xsl:if test="$setMoreButton = 'true'">
@@ -714,7 +715,7 @@
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting" select="'formatDefFile'" />
                 <xsl:with-param name="default"
-                        select="'SciPublicationsDefaultFormat.xml'" />
+                                select="'SciPublicationsDefaultFormat.xml'" />
             </xsl:call-template>
         </xsl:variable>
 
@@ -762,7 +763,7 @@
                                         </xsl:choose>
                                     </xsl:with-param>
                                     <xsl:with-param name="authorCount"
-                                  select="'1'" />
+                                                    select="'1'" />
                                     <xsl:with-param name="position" select="'1'" />
                                     <xsl:with-param name="linkAuthor" select="$linkAuthors" />
                                 </xsl:apply-templates>
@@ -796,6 +797,44 @@
         </dd>
 
     </xsl:template>
+    
+    <xsl:template name="scipublications_assigned_terms">
+        <!--<xsl:param name="domainsToShow"/>-->
+        <xsl:param name="separator" select="', '" />
+        
+        <!--<code>scipublications_assigned_terms</code>-->
+        
+        <!--<code><xsl:value-of select="concat('domainsToShow = ', $domainsToShow)"/></code>-->
+        <!--<code><xsl:value-of select="concat('domainsToShow: ', count(document(concat($theme-prefix, '/settings/SciPublications.xml'))/settings/setting[@id='detailView/domainsToShow']/domain))"/></code>-->
+        
+        <xsl:for-each select="document(concat($theme-prefix, '/settings/SciPublications.xml'))/settings/setting[@id='detailView/domainsToShow']/domain">
+            
+            <xsl:variable name="domain">
+                <xsl:value-of select="."/>
+            </xsl:variable>
+            
+            <!--<code>Showing domain </code>
+            <xsl:value-of select="$domain"/>-->
+            
+            <!--<xsl:value-of select="concat(' terms: ', count($resultTree//terms:assignedTerms/terms:term[@domain=$domain]))"/>-->
+            
+            <xsl:for-each select="$resultTree//terms:assignedTerms/terms:term[@domain=$domain]">
+                <xsl:choose>
+                    <xsl:when test="position() &lt; count($resultTree//terms:assignedTerms/terms:term[@domain=$domain])">
+                        <xsl:value-of select="concat(./@name, $separator)"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="./@name"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+                <!--<xsl:value-of select="./@name"/>
+                <xsl:value-of select="position()"/>-->
+            </xsl:for-each>
+            
+        </xsl:for-each>
+        
+    </xsl:template>
+    
     <!--  <xsl:template name="scipublicationsDownload">
       <xsl:if test="./masterVersion/id">
         <h3 class="publicationDownloads">