diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
index d2e1c9eb3..218a5a580 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
@@ -6,7 +6,7 @@
 >
 
 <#function getAvailableTabs item>
-    <#return item["./orgaUnitTabs/availableTabs"]>
+    <#return item["./orgaUnitTabs/availableTabs/availableTab"]>
 </#function>
 
 <#function getTypeNameKey item>
@@ -53,7 +53,7 @@
 </#function>
 
 <#function getAddendum data>
-    <#return data["./addendum"]>
+    <#return data["./addendum"].@@text>
 </#function>
 
 <#function getMembers data>