diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
index e5e195472..073a93908 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
@@ -30,7 +30,16 @@
                 version="2.0">
     
     <xsl:template match="related-links">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        <xsl:param name="contentitem-tree" tunnel="yes">
+            <xsl:choose>
+                <xsl:when test="$data-tree/nav:greetingItem">
+                    <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:param>
         
         <xsl:if test="$contentitem-tree/links">
             <xsl:apply-templates/>
@@ -38,7 +47,16 @@
     </xsl:template>
 
     <xsl:template match="related-links//related-link">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        <xsl:param name="contentitem-tree" tunnel="yes">
+            <xsl:choose>
+                <xsl:when test="$data-tree/nav:greetingItem">
+                    <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:param>
         
         <xsl:variable name="links-layout-tree" select="current()"/>
         
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index 0e4592361..1f226d9ad 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -128,6 +128,10 @@
         
     </xsl:template>
     
+    <xsl:template match="breadcrumbs-current-category">
+        <xsl:value-of select="$data-tree//nav:categoryPath/nav:category[position() = last()]/@title"/>
+    </xsl:template>
+    
     <foundry:doc>
         <foundry:doc-attribute name="navigation-id">
             The id of the navigation/category system from which URL should be retrieved. Default