diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
index 5a0ff88ee..39731b83a 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
@@ -89,11 +89,11 @@
             <xsl:when test="@id != '' or @class != '' or with-colorset = 'true'">
                 <span>
                     <xsl:call-template name="foundry:set-id-and-class"/>
-                    <xsl:value-of select="foundry:get-static-text($module, .)"/>
+                    <xsl:value-of select="foundry:get-static-text($module, normalize-space(.))"/>
                 </span>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="foundry:get-static-text($module, .)"/>
+                <xsl:value-of select="foundry:get-static-text($module, normalize-space(.))"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 291c523cf..7a6f7dbd7 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -510,12 +510,12 @@
             </xsl:if>
 
             <!--<span id="top"/>-->
-            <a href="#startcontent" accesskey="S" class="nav-hide">
+            <!--<a href="#startcontent" accesskey="S" class="nav-hide">
                 <xsl:attribute name="title"> 
                     <xsl:value-of select="foundry:get-static-text('', 'layout/page/skipnav/title')"/>
                 </xsl:attribute>
                 <xsl:value-of select="foundry:get-static-text('', 'layout/page/skipnav/link')"/>
-            </a>
+            </a>-->
 
             <xsl:apply-templates/>
         </body>