diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/notes.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/notes.xsl
index 7382d9b63..83780b1be 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/notes.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/notes.xsl
@@ -63,14 +63,9 @@
     <xsl:template match="note//note-content">
         <xsl:param name="note-content" tunnel="yes"/>
         
-        <xsl:choose>
-            <xsl:when test="count($note-content/*) &gt; 0">
-                <xsl:copy-of select="$note-content/*"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$note-content"/>
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:value-of disable-output-escaping="yes"
+                      select="$note-content"/>
+        
     </xsl:template>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
index d9002b2cb..b7d71fb39 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
@@ -236,15 +236,21 @@
             <xsl:when test="contains($filename, '/')">
                 <xsl:choose>                   
                     <xsl:when test="string-length($media) &gt; 0">
-                        <link rel="stylesheet"
+                        <link rel="{foundry:gen-style-rel-value($less, $less-onthefly)}"
                               type="text/css"
-                              href="{foundry:gen-path($filename, $origin)}"
+                              href="{foundry:gen-path(foundry:gen-style-filename($less,
+                                                                                 $less-onthefly,
+                                                                                 $filename),
+                                                      $origin)}"
                               media="{$media}"/>
                     </xsl:when>
                     <xsl:otherwise>
-                        <link rel="stylesheet"
+                        <link rel="{foundry:gen-style-rel-value($less, $less-onthefly)}"
                               type="text/css"
-                              href="{foundry:gen-path($filename, $origin)}"/>
+                              href="{foundry:gen-path(foundry:gen-style-filename($less,
+                                                                                 $less-onthefly,
+                                                                                 $filename), 
+                                                      $origin)}"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>
@@ -296,11 +302,20 @@
         <xsl:param name="filename" as="xs:string"/>
         
         <xsl:choose>
-            <xsl:when test="$less and $less-onthefly and foundry:debug-enabled()">
-                <xsl:value-of select="concat($filename, '.less')"/>
+            <xsl:when test="$less = true()">
+                <xsl:choose>
+                    <xsl:when test="($less = true()) 
+                             and ($less-onthefly = true()) 
+                             and (foundry:debug-enabled() = true())">
+                        <xsl:value-of select="concat($filename, '.less')"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="concat($filename, '.css')"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="concat($filename, '.css')"/>
+                <xsl:value-of select="$filename"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>