Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -140,11 +140,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -190,6 +185,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>