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 e84c091f0..03aab8d99 100644
--- a/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl
+++ b/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl
@@ -74,7 +74,7 @@
 </#function>
 
 <#function getPersonalPublicationsAvailablePublicationGroups data>
-    <#return data["./ppp:profile/personalPublications/availablePublicationGroups"]>
+    <#return data["./ppp:profile/personalPublications/availablePublicationGroups/availablePublicationGroup"]>
 </#function>
 
 <#function getPublicationGroupId group>
@@ -82,7 +82,8 @@
 </#function>
 
 <#function getPublicationGroupLink group>
-    <#if (model["ppp:profile/personalPublications/publications/@all"] == "all")>
+    <#if (model["ppp:profile/personalPublications/publications/@all"]?size > 0
+          && model["ppp:profile/personalPublications/publications/@all"] == "all")>
         <#return "#" + group["./@name"]>
     <#else>
         <#return "?group=" + group["./@name"]>
@@ -98,43 +99,43 @@
 </#function>
 
 <#function hasPublicationsPaginator profile>
-    <#return (model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator"]?size > 0)>
+    <#return (model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator"]?size > 0)>
 </#function>
 
 <#function getPublicationsPaginatorBaseUrl profile>
-    <#if (model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"]?contains("?"))>
-        <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"].@@text + "&">
+    <#if (model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"]?contains("?"))>
+        <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"] + "&">
     <#else>
-        <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"].@@text + "?">
+        <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"] + "?">
     </#if>
 </#function>
 
 <#function getPublicationsPaginatorPageCount profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageCount"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageCount"]?number>
 </#function>
 
 <#function getPublicationsPaginatorPageNumber profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageNumber"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageNumber"]?number>
 </#function>
 
 <#function getPublicationsPaginatorPageParam profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageParam"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageParam"]>
 </#function>
 
 <#function getPublicationsPaginatorPageSize profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageSize"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageSize"]?number>
 </#function>
 
 <#function getPublicationsPaginatorObjectBegin profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@objectBegin"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@objectBegin"]?number>
 </#function>
 
 <#function getPublicationsPaginatorObjectCount profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@objectCount"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@objectCount"]?number>
 </#function>
 
 <#function getPublicationsPaginatorObjectEnd profile>
-    <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@objectEnd"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@objectEnd"]?number>
 </#function>
 
 <#function getPublicationsPaginatorPrevPageLink profile>
@@ -178,43 +179,43 @@
 </#function>
 
 <#function hasProjectsPaginator profile>
-    <#return (model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator"]?size > 0)>
+    <#return (model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator"]?size > 0)>
 </#function>
 
 <#function getProjectsPaginatorBaseUrl profile>
-    <#if (model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"]?contains("?"))>
-        <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"].@@text + "&">
+    <#if (model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"]?contains("?"))>
+        <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "&">
     <#else>
-        <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"].@@text + "?">
+        <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "?">
     </#if>
 </#function>
 
 <#function getProjectsPaginatorPageCount profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageCount"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageCount"]?number>
 </#function>
 
 <#function getProjectsPaginatorPageNumber profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageNumber"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageNumber"]?number>
 </#function>
 
 <#function getProjectsPaginatorPageParam profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageParam"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageParam"]>
 </#function>
 
 <#function getProjectsPaginatorPageSize profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageSize"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageSize"]?number>
 </#function>
 
 <#function getProjectsPaginatorObjectBegin profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@objectBegin"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@objectBegin"]?number>
 </#function>
 
 <#function getProjectsPaginatorObjectCount profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@objectCount"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@objectCount"]?number>
 </#function>
 
 <#function getProjectsPaginatorObjectEnd profile>
-    <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@objectEnd"].@@text>
+    <#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@objectEnd"]?number>
 </#function>
 
 <#function getProjectsPaginatorPrevPageLink profile>
diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl
index 5979a7c08..1d17889bb 100644
--- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl
+++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl
@@ -5,7 +5,7 @@
 "ui": "http://www.arsdigita.com/ui/1.0"}
 >
 
-<#import ../ccm-cms/content-item.ftl as ContentItem>
+<#import "../ccm-cms/content-item.ftl" as ContentItem>
 
 <#function getHref article>
     <#return ContentItem.generateContentItemLink(article["./@oid"])>
diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl
index bc0ed21cd..0bad2da57 100644
--- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl
+++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl
@@ -5,7 +5,7 @@
 "ui": "http://www.arsdigita.com/ui/1.0"}
 >
 
-<#import ../ccm-cms/content-item.ftl as ContentItem>
+<#import "../ccm-cms/content-item.ftl" as ContentItem>
 
 <#function getHref collectedVolume>
     <#return ContentItem.generateContentItemLink(collectedVolume["./@oid"])>
diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl
index 5bc0ac233..fef705066 100644
--- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl
+++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl
@@ -5,7 +5,7 @@
 "ui": "http://www.arsdigita.com/ui/1.0"}
 >
 
-<#import ../ccm-cms/content-item.ftl as ContentItem>
+<#import "../ccm-cms/content-item.ftl" as ContentItem>
 
 <#function getFirstYear(journal)>
     <#return journal["./firstYear"]>
diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl
index 09de541f4..7cad879c1 100644
--- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl
+++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl
@@ -5,7 +5,7 @@
 "ui": "http://www.arsdigita.com/ui/1.0"}
 >
 
-<#import ../ccm-cms/content-item.ftl as ContentItem>
+<#import "../ccm-cms/content-item.ftl" as ContentItem>
 
 <#function getHref proceedings>
     <#return ContentItem.generateContentItemLink(proceedings["./@oid"])>
diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/publications.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/publications.ftl
index 48f081f9d..08ae361d4 100644
--- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/publications.ftl
+++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/publications.ftl
@@ -6,7 +6,7 @@
 >
 
 <#function getAssignedTermsDomains item domain>
-    <#return item["./terms:assignedTerms/terms:term[@domain='${domain}']]>
+    <#return item["./terms:assignedTerms/terms:term[@domain='${domain}']"]>
 </#function>
 
 <#function getAuthors item>
@@ -66,7 +66,7 @@
 </#function>
 
 <#function getPlace item>
-    <#return item["./place"]>
+    <#return item["./place"].@@text>
 </#function>
 
 <#function getPagesFrom item>
@@ -94,7 +94,7 @@
 </#function>
 
 <#function getOrderer item>
-    <#return item["./orderer]>
+    <#return item["./orderer"]>
 </#function>
 
 <#function getIssn item>
diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl
index 01c19ab7a..f525c33b4 100644
--- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl
+++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl
@@ -5,7 +5,7 @@
 "ui": "http://www.arsdigita.com/ui/1.0"}
 >
 
-<#import ../ccm-cms/content-item.ftl as ContentItem>
+<#import "../ccm-cms/content-item.ftl" as ContentItem>
 
 <#function getFilters series>
     <#return series["./filters/filter"]>
@@ -20,7 +20,7 @@
 </#function>
 
 <#function getVolume series>
-    <#return series["./volume"]>
+    <#return series["./@volume"]>
 </#function>
 
 <#function getVolumeHref volume>