Index: src/plugin-resources/site.jsl
===================================================================
--- src/plugin-resources/site.jsl	(revision 267228)
+++ src/plugin-resources/site.jsl	(working copy)
@@ -53,7 +53,6 @@
       
     <html>
       <head>
-        <j:set var="docTitle"><x:expr select="./properties/title"/></j:set>
 
         <!-- Key is more important than message... -->
         <!-- From doc -->
@@ -64,9 +63,7 @@
           <x:expr select="./properties/title/@bundle" />
         </j:set>
         <j:if test="${empty(_docKey)}">
-          <j:set var="_docTitle">
-            <x:expr select="./properties/title" />
-          </j:set>
+          <x:set var="_docTitle" select="string(./properties/title)"/>
         </j:if>
         <j:if test="${!empty(_docKey)}">
           <!-- Shortcut for the user bundle -->
@@ -88,9 +85,7 @@
           <x:expr select="$nav/title/@bundle" />
         </j:set>
         <j:if test="${empty(_navKey)}">
-          <j:set var="_navTitle">
-            <x:expr select="$nav/title" />
-          </j:set>
+          <x:set var="_navTitle" select="string($nav/title)"/>
         </j:if>
         <j:if test="${!empty(_navKey)}">
           <!-- Shortcut for the user bundle -->
@@ -442,7 +437,7 @@
   <!-- process a documentation section -->
   <jsl:template match="section" trim="true">
     <div class="section">
-      <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+      <x:set var="_sectionName" select="string(@name)"/>
       
       <!-- Key is more important than message... -->
       <j:set var="_key">
@@ -474,7 +469,7 @@
 
   <jsl:template match="subsection" trim="true">
     <div class="subsection">
-      <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+      <x:set var="_sectionName" select="string(@name)"/>
       
       <!-- Key is more important than message... -->
       <j:set var="_key">
@@ -554,14 +549,14 @@
     </x:element>
   </jsl:template>
 
-  <!-- Process the breadcrumb navbar -->
+  <!-- Process the links navbar -->
   <jsl:template match="links" trim="true">
     <j:set var="linkCount" value="1"/>
     <x:forEach var="link" select="item">
-      <j:set var="_img"><x:expr select="@img"/></j:set>
-      <j:set var="_name"><x:expr select="@name"/></j:set>
-      <j:set var="_link"><x:expr select="@href"/></j:set>
-      <j:set var="_target"><x:expr select="@target"/></j:set>
+      <x:set var="_img" select="string(@img)"/>
+      <x:set var="_name" select="string(@name)"/>
+      <x:set var="_link" select="string(@href)"/>
+      <x:set var="_target" select="string(@target)"/>
       <j:whitespace trim="false">
         <j:if test="${linkCount != 1}">
           <j:if test="${!(maven.xdoc.crumb.separator == '')}">
@@ -577,8 +572,8 @@
   <!-- Process the breadcrumb navbar -->
   <jsl:template match="breadcrumbs" trim="true">    
     <x:forEach var="link" select="item">
-      <j:set var="_name"><x:expr select="@name"/></j:set>
-      <j:set var="_link"><x:expr select="@href"/></j:set>     
+      <x:set var="_name" select="string(@name)"/>
+      <x:set var="_link" select="string(@href)"/>
       <a href="${_link}">${_name}</a>
       &#160;<span class="separator">&gt;</span>&#160;
     </x:forEach>
@@ -586,7 +581,7 @@
 
   <!-- Process a menu for the navigation bar -->
   <jsl:template match="menu" trim="true">
-    <j:set var="_menuName"><x:expr select="string(@name)"/></j:set>
+    <x:set var="_menuName" select="string(@name)"/>
     <j:set var="_menuNameEscaped"><doc:escapeNameToken value="${_menuName}"/></j:set>
     <!-- Key is more important than message... -->
     <j:set var="_key">
