diff --git a/ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl b/ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl
index 3cd82fff5..7c28efd3b 100644
--- a/ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl
+++ b/ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl
@@ -19,7 +19,7 @@
 
 <#function getContactEntry item keyId>
     <#return item["./contactentries[keyId=${keyId}]"]>
-<#/function>
+</#function>
 
 <#function getContactEntryLabel entry>
     <#return item["./key"]>
diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/person.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/person.ftl
index 2686bc96f..f2c151e03 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/person.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/person.ftl
@@ -22,7 +22,7 @@
 </#function>
 
 <#function getHomepageLink item contactType="commonContact" entry="homepage">
-    <#return item["./contacts/contact[./@contactType='${contactType}']/contactentries[./keyId='${entry}]/value'"]>
+    <#return item["./contacts/contact[./@contactType='${contactType}']/contactentries[./keyId='${entry}']/value"]>
 </#function>
 
 <#function getContactEntries item contactType="commonContact">
@@ -30,5 +30,5 @@
 </#function>
 
 <#function getAddress item contactType="commonContact">
-    <#return item["./contacts/contact[@contactType='${contactType}']/address]
+    <#return item["./contacts/contact[@contactType='${contactType}']/address"]>
 </#function>
diff --git a/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl b/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl
index 6e852ba86..803f76d39 100644
--- a/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl
+++ b/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl
@@ -26,7 +26,7 @@
 </#function>
 
 <#function getDepartmentHeads data>
-    <#return data["./heads"]>
+    <#return data["./heads/head"]>
 </#function>
 
 <#function getDepartmentHeadId head>
@@ -38,7 +38,7 @@
 </#function>
 
 <#function getDepartmentViceHeads data>
-    <#return data["./heads"]>
+    <#return data["./viceheads/vicehead"]>
 </#function>
 
 <#function getDepartmentViceHeadId head>
@@ -50,7 +50,7 @@
 </#function>
 
 <#function getSecretariats data>
-    <#return data["./heads"]>
+    <#return data["./secretariats/secretariat"]>
 </#function>
 
 <#function getSecretariatsId sec>