diff --git a/core/src/main/resources/template/ajax/head.ftl b/core/src/main/resources/template/ajax/head.ftl
index a2415cb32..4eb0ed8d4 100644
--- a/core/src/main/resources/template/ajax/head.ftl
+++ b/core/src/main/resources/template/ajax/head.ftl
@@ -1,6 +1,6 @@
 <#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
 <script language="JavaScript" type="text/javascript"
-        src="<@s.url includeParams='none' value='/struts/ajax/dojoRequire.js' includeParams="none" encode='false'  />"></script>
+        src="<@s.url includeParams='none' value='/struts/ajax/dojoRequire.js' includeParams='none' encode='false'  />"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@s.url includeParams='none' value='/struts/CommonFunctions.js' includeParams="none" encode='false'/>"></script>
+        src="<@s.url includeParams='none' value='/struts/CommonFunctions.js' includeParams='none' encode='false'/>"></script>
diff --git a/core/src/main/resources/template/ajax/tree.ftl b/core/src/main/resources/template/ajax/tree.ftl
index 1b04e0481..ee6fc92c2 100644
--- a/core/src/main/resources/template/ajax/tree.ftl
+++ b/core/src/main/resources/template/ajax/tree.ftl
@@ -8,46 +8,46 @@
  </script>
 <div dojoType="Tree"   
 	<#if parameters.blankIconSrc?exists>
-	gridIconSrcT="<@s.url value='${parameters.blankIconSrc}' encode="false" />"
+	gridIconSrcT="<@s.url value='${parameters.blankIconSrc}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcL?exists>
-	gridIconSrcL="<@s.url value='${parameters.gridIconSrcL}' encode="false" />"
+	gridIconSrcL="<@s.url value='${parameters.gridIconSrcL}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcV?exists>
-	gridIconSrcV="<@s.url value='${parameters.gridIconSrcV}' encode="false" />"
+	gridIconSrcV="<@s.url value='${parameters.gridIconSrcV}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcP?exists>
-	gridIconSrcP="<@s.url value='${parameters.gridIconSrcP}' encode="false" />"
+	gridIconSrcP="<@s.url value='${parameters.gridIconSrcP}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcC?exists>
-	gridIconSrcC="<@s.url value='${parameters.gridIconSrcC}' encode="false" />"
+	gridIconSrcC="<@s.url value='${parameters.gridIconSrcC}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcX?exists>
-	gridIconSrcX="<@s.url value='${parameters.gridIconSrcX}' encode="false" />"
+	gridIconSrcX="<@s.url value='${parameters.gridIconSrcX}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcY?exists>
-	gridIconSrcY="<@s.url value='${parameters.gridIconSrcY}' encode="false" />"
+	gridIconSrcY="<@s.url value='${parameters.gridIconSrcY}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.gridIconSrcZ?exists>
-	gridIconSrcZ="<@s.url value='${parameters.gridIconSrcZ}' encode="false" />"
+	gridIconSrcZ="<@s.url value='${parameters.gridIconSrcZ}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.expandIconSrcPlus?exists>
-	expandIconSrcPlus="<@s.url value='${parameters.expandIconSrcPlus}' />"
+	expandIconSrcPlus="<@s.url value='${parameters.expandIconSrcPlus}' includeParams='none'/>"
 	</#if>
 	<#if parameters.expandIconSrcMinus?exists>
-	expandIconSrcMinus="<@s.url value='${parameters.expandIconSrcMinus?html}' />"
+	expandIconSrcMinus="<@s.url value='${parameters.expandIconSrcMinus?html}' includeParams='none'/>"
 	</#if>
 	<#if parameters.iconWidth?exists>
-	iconWidth="<@s.url value='${parameters.iconWidth?html}' encode="false" />"
+	iconWidth="<@s.url value='${parameters.iconWidth?html}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.iconHeight?exists>
-	iconHeight="<@s.url value='${parameters.iconHeight?html}' encode="false" />"
+	iconHeight="<@s.url value='${parameters.iconHeight?html}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.toggleDuration?exists>
 	toggleDuration=${parameters.toggleDuration?c}
 	</#if>
 	<#if parameters.templateCssPath?exists>
-	templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" />"
+	templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
 	</#if>
 	<#if parameters.showGrid?exists>
 	showGrid="${parameters.showGrid?default(true)?string}"
diff --git a/core/src/main/resources/template/ajax/treenode.ftl b/core/src/main/resources/template/ajax/treenode.ftl
index 6125c1a1e..858ed45e0 100644
--- a/core/src/main/resources/template/ajax/treenode.ftl
+++ b/core/src/main/resources/template/ajax/treenode.ftl
@@ -1,6 +1,6 @@
 <div dojoType="TreeNode" 
 	<#if parameters.childIconSrc?exists>
-	childIconSrc="<@s.url value='${parameters.childIconSrc}' encode="false" />"
+	childIconSrc="<@s.url value='${parameters.childIconSrc}' includeParams='none' encode='false' />"
 	</#if>
     <#if parameters.id?exists>id="${parameters.id?html}"</#if>
     title="${parameters.label}">
diff --git a/core/src/main/resources/template/css_xhtml/head.ftl b/core/src/main/resources/template/css_xhtml/head.ftl
index 435627630..9043cf657 100644
--- a/core/src/main/resources/template/css_xhtml/head.ftl
+++ b/core/src/main/resources/template/css_xhtml/head.ftl
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams="none" encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />
diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl
index fa9993708..612fdd6dd 100644
--- a/core/src/main/resources/template/simple/optiontransferselect.ftl
+++ b/core/src/main/resources/template/simple/optiontransferselect.ftl
@@ -1,5 +1,5 @@
 <#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
-	<script language="javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' />"></script>
+	<script language="javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"></script>
 	<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
 </#if><#t/>
 <table border="0">
diff --git a/core/src/main/resources/template/simple/updownselect.ftl b/core/src/main/resources/template/simple/updownselect.ftl
index e8d7bf222..c52a401cb 100644
--- a/core/src/main/resources/template/simple/updownselect.ftl
+++ b/core/src/main/resources/template/simple/updownselect.ftl
@@ -1,5 +1,5 @@
 <#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
-	<script language="javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' />"></script>
+	<script language="javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"></script>
 	<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
 </#if><#t/>
 <table>
diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl
index 8a11aead2..795ffacfc 100644
--- a/core/src/main/resources/template/xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/xhtml/checkbox.ftl
@@ -66,7 +66,7 @@ ${parameters.label?html}<#t/>
 </#if>
 :<#t/>
 <#if parameters.tooltip?exists>
-    <img src='<@s.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+    <img src='<@s.url value="/struts/tooltip/tooltip.gif" includeParams="none" encode="false"/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
 </#if>
 </label><#t/>
 </#if>
@@ -76,7 +76,7 @@ ${parameters.label?html}<#t/>
         <span class="required">*</span><#t/>
     </#if>
     <#if parameters.tooltip?exists>
-        <img src='<@s.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+        <img src='<@s.url value="/struts/tooltip/tooltip.gif" includeParams="none" encode="false"/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
     </#if>
 </#if>
     </td>
diff --git a/core/src/main/resources/template/xhtml/head.ftl b/core/src/main/resources/template/xhtml/head.ftl
index 66969bf7f..a3adae8be 100644
--- a/core/src/main/resources/template/xhtml/head.ftl
+++ b/core/src/main/resources/template/xhtml/head.ftl
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css' includeParams="none" encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@s.url value='/struts/xhtml/styles.css' includeParams='none' encode='false' />" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />
diff --git a/core/src/main/resources/template/xhtml/tooltip.ftl b/core/src/main/resources/template/xhtml/tooltip.ftl
index 4851d6d5a..5029c560b 100644
--- a/core/src/main/resources/template/xhtml/tooltip.ftl
+++ b/core/src/main/resources/template/xhtml/tooltip.ftl
@@ -2,9 +2,9 @@
 	  <#assign tooltipHashCode=parameters.tooltip.hashCode() />
       <img id="_tt${tooltipHashCode?string('#')}"
       <#if parameters.tooltipIcon?exists><#t/>
-      	src='<@s.url value="${parameters.tooltipIcon}" />'
+      	src='<@s.url value="${parameters.tooltipIcon}" includeParams="none" encode="false" />'
       <#else><#t/>
-      	src='<@s.url value="/struts/dojo/struts/tooltip.gif" />'
+      	src='<@s.url value="/struts/dojo/struts/tooltip.gif" includeParams="none" encode="false" />'
       </#if><#t/>
       	alt="${parameters.tooltip?html}" 
       	title="${parameters.tooltip?html}" />