diff --git a/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl b/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl
index d4fb0c9e6..e84c091f0 100644
--- a/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl
+++ b/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl
@@ -82,7 +82,7 @@
 </#function>
 
 <#function getPublicationGroupLink group>
-    <#if (data["ppp:profile/personalPublications/publications/@all"] == "all")>
+    <#if (model["ppp:profile/personalPublications/publications/@all"] == "all")>
         <#return "#" + group["./@name"]>
     <#else>
         <#return "?group=" + group["./@name"]>
diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
index 98c63a04e..73276c822 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/content-item.ftl
@@ -60,7 +60,7 @@
         <#return getLocalizedText('layout.page.title.search')>
     <#elseif (model["/bebop:page/@application"] == 'login')>
         <#return getLocalizedText('layout.page.title.login')>
-    <#elseif (model["/bebop:page/@id"] == 'sitemapPage')>
+    <#elseif ((model["/bebop:page/@id"]?size > 0) && (model["/bebop:page/@id"] == 'sitemapPage'))>
         <#return getLocalizedText('layout.page.title.sitemap')>
     <#elseif (model["/bebop:page/@application"] == 'PublicPersonalProfile' && model["/bebop:page/nav:greetingItem"]?size > 0)>
         <#return model["/bebop:page/nav:greetingItem/cms:item/title"].@@text>