diff --git a/bin/fval.xsl b/bin/fval.xsl
index 09c1b92..cf24bc6 100644
--- a/bin/fval.xsl
+++ b/bin/fval.xsl
@@ -21,25 +21,16 @@
 		{
 			display_row(document.FORM1.cbErr, "class_E");
 		}
-		function display_table(table_id)
+		function display_table(checked, table_id)
 		{
-			table_id.style.display = (table_id.style.display == "none" ) ? "" : "none";
+			table_id.style.display = checked ? "" : "none";
 		}
 		function display_row(cb_id, row_classname)
 		{
-			rowColl = document.all.tags("TR");
+			rowColl = document.body.querySelectorAll("TR." + row_classname);
 			for (i=0; i!=rowColl.length; i++) {
-				if (rowColl(i).className == row_classname)
-				{
-					if (cb_id.checked)
-					{
-						rowColl(i).style.display = "";
-					}
-					else
-					{
-						rowColl(i).style.display = "none";
-					}
-				}
+				rowColl.item(i).style.display =
+					cb_id.checked ? "" : "none";
 			}
 		}
 		</script>
@@ -79,30 +70,26 @@
 		</TD>
 
 		<TD BGCOLOR="#ccffff" WIDTH="100">
-		<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-		id='cbInfo' type='checkbox' name='cbInfo' onclick='cbInfo_onclick()'
-		<xsl:text disable-output-escaping="yes">checked&gt;</xsl:text>		
+		  <INPUT id='cbInfo' type='checkbox' name='cbInfo'
+			 onclick='cbInfo_onclick()' checked="1" />
 		Info
 		</TD>
 		
 		<TD BGCOLOR="#99ff99" WIDTH="100">
-		<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-		id='cbPass' type='checkbox' name='cbPass' onclick='cbPass_onclick()'
-		<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
-		Pass 
+		  <INPUT id='cbPass' type='checkbox' name='cbPass'
+			 onclick='cbPass_onclick()' checked="1" />
+		Pass
 		</TD>
 		
 		<TD BGCOLOR="#ffff99" WIDTH="100">
-		<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-		id='cbWarn' type='checkbox' name='cbWarn' onclick='cbWarn_onclick()'
-		<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
-		Warning 
+		  <INPUT id='cbWarn' type='checkbox' name='cbWarn'
+			 onclick='cbWarn_onclick()' checked="1"/>
+		Warning
 		</TD>
 		
 		<TD BGCOLOR="#ff9999" WIDTH="100">
-		<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-		id='cbErr' type='checkbox' name='cbErr' onclick='cbErr_onclick()'
-		<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
+		<INPUT id='cbErr' type='checkbox' name='cbErr'
+		       onclick='cbErr_onclick()' checked="1"/>
 		Error 
 		</TD>
 
@@ -153,11 +140,9 @@
 				<TR>
 				<TD>
 				
-				<xsl:text disable-output-escaping="yes">&lt;A</xsl:text>		
-				HREF='#<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>'
-				<xsl:text disable-output-escaping="yes">&gt;</xsl:text>		
-				<xsl:value-of select="@Tag"/>
-				<xsl:text disable-output-escaping="yes">&lt;/A&gt;</xsl:text>		
+				<A HREF='#{@CodeFriendlyTag}_{parent::node()/@FontIndex}'>
+				  <xsl:value-of select="@Tag"/>
+				</A>
 				</TD>
 				<TD><xsl:value-of select="@Offset"/></TD>
 				<TD><xsl:value-of select="@Length"/></TD>
@@ -179,80 +164,78 @@
 			
 			<xsl:for-each select="TableEntry">
 				<BR/>
-				<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-				id='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' type='checkbox' name='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' onclick='display_table(table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>)'
-				<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
+				<INPUT
+				    id='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}'
+				    type='checkbox'
+				    name='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}'
+				    onclick='display_table(cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}.checked, table_{@CodeFriendlyTag}_{parent::node()/@FontIndex})'
+				checked='1'/>
 				<B>
-				<xsl:text disable-output-escaping="yes">&lt;A</xsl:text>		
-				NAME='<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>'
-				<xsl:text disable-output-escaping="yes">&gt;</xsl:text>		
-				<xsl:value-of select="@Tag"/>
-				<xsl:text disable-output-escaping="yes">&lt;/A&gt;</xsl:text>		
+				<A
+				NAME='{@CodeFriendlyTag}_{parent::node()/@FontIndex}'>
+				  <xsl:value-of select="@Tag"/>
+				</A>
 				</B><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;TABLE</xsl:text>		
-				WIDTH='100%' id='table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>'
-				<xsl:text disable-output-escaping="yes">&gt;</xsl:text>		
-				<TR CLASS="caption">
-				<TD WIDTH="10%"><I>Error code</I></TD>
-				<TD WIDTH="50%"><I>Message</I></TD>
-				<TD WIDTH="40%"><I>Details</I></TD>
-				</TR>
-				<xsl:apply-templates select="Report"/><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;/TABLE&gt;</xsl:text>
+				<TABLE
+				WIDTH='100%' id='table_{@CodeFriendlyTag}_{parent::node()/@FontIndex}'>
+				  <TR CLASS="caption">
+				    <TD WIDTH="10%"><I>Error code</I></TD>
+				    <TD WIDTH="50%"><I>Message</I></TD>
+				    <TD WIDTH="40%"><I>Details</I></TD>
+				  </TR>
+				  <xsl:apply-templates select="Report"/><BR/>
+				</TABLE>
 				<BR/>
 			</xsl:for-each>
 			<xsl:for-each select="RasterizationTest_BW">
 				<BR/>
-				<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-				id='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' type='checkbox' name='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' onclick='display_table(table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>)'
-				<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
+				<INPUT
+				id='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}' type='checkbox' name='cb_{CodeFriendlyTag}_{parent::node()/@FontIndex}' onclick='display_table(cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}.checked, table_{@CodeFriendlyTag}_{parent::node()/@FontIndex})'
+				checked='1'/>
 				<B>Rasterization Test, BW</B><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;TABLE</xsl:text>		
-				WIDTH='100%' id='table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>'
-				<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+				<TABLE
+				WIDTH='100%' id='table_{@CodeFriendlyTag}_{parent::node()/@FontIndex}'>
 				<TR CLASS="caption">
 				<TD WIDTH="10%"><I>Error code</I></TD>
 				<TD WIDTH="50%"><I>Message</I></TD>
 				<TD WIDTH="40%"><I>Details</I></TD>
 				</TR>
 				<xsl:apply-templates select="Report"/><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;/TABLE&gt;</xsl:text>
+				</TABLE>
 				<BR/>
 			</xsl:for-each>
 			<xsl:for-each select="RasterizationTest_Grayscale">
 				<BR/>
-				<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-				id='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' type='checkbox' name='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' onclick='display_table(table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>)'
-				<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
+				<INPUT
+				id='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}' type='checkbox' name='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}' onclick='display_table(cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}.checked, table_{@CodeFriendlyTag}_{parent::node()/@FontIndex})'
+				checked='1'/>
 				<B>Rasterization Test, Grayscale</B><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;TABLE</xsl:text>		
-				WIDTH='100%' id='table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>'
-				<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+				<TABLE
+				WIDTH='100%' id='table_{@CodeFriendlyTag}_{parent::node()/@FontIndex}'>
 				<TR CLASS="caption">
 				<TD WIDTH="10%"><I>Error code</I></TD>
 				<TD WIDTH="50%"><I>Message</I></TD>
 				<TD WIDTH="40%"><I>Details</I></TD>
 				</TR>
 				<xsl:apply-templates select="Report"/><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;/TABLE&gt;</xsl:text>
+				</TABLE>
 				<BR/>
 			</xsl:for-each>
 			<xsl:for-each select="RasterizationTest_ClearType">
 				<BR/>
-				<xsl:text disable-output-escaping="yes">&lt;INPUT</xsl:text>		
-				id='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' type='checkbox' name='cb_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>' onclick='display_table(table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>)'
-				<xsl:text disable-output-escaping="yes">checked &gt;</xsl:text>		
+				<INPUT
+				id='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}' type='checkbox' name='cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}' onclick='display_table(cb_{@CodeFriendlyTag}_{parent::node()/@FontIndex}.checked, table_{@CodeFriendlyTag}_{parent::node()/@FontIndex})'
+				checked='1'/>
 				<B>Rasterization Test, ClearType</B><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;TABLE</xsl:text>		
-				WIDTH='100%' id='table_<xsl:value-of select="@CodeFriendlyTag"/>_<xsl:value-of select="parent::node()/@FontIndex"/>'
-				<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+				<TABLE
+				WIDTH='100%' id='table_{@CodeFriendlyTag}_{parent::node()/@FontIndex}'>
 				<TR CLASS="caption">
 				<TD WIDTH="10%"><I>Error code</I></TD>
 				<TD WIDTH="50%"><I>Message</I></TD>
 				<TD WIDTH="40%"><I>Details</I></TD>
 				</TR>
 				<xsl:apply-templates select="Report"/><BR/>
-				<xsl:text disable-output-escaping="yes">&lt;/TABLE&gt;</xsl:text>
+				</TABLE>
 				<BR/>
 			</xsl:for-each>
 			
@@ -273,13 +256,11 @@
 	
 	<xsl:template match = "Report">
 	
-		<xsl:text disable-output-escaping="yes">&lt;TR</xsl:text>		
-		class='class_<xsl:value-of select="@ErrorType"/>'
-		<xsl:text disable-output-escaping="yes">&gt;</xsl:text>		
+		<TR class='class_{@ErrorType}'>
 		<TD VALIGN="TOP"> <xsl:value-of select="@ErrorCode"/> </TD>
 		<TD VALIGN="TOP"> <xsl:value-of select="@Message"/> </TD>
 		<TD VALIGN="TOP"> <xsl:value-of select="@Details"/> </TD>
-		<xsl:text disable-output-escaping="yes">&lt;/TR&gt;</xsl:text>
+		</TR>
 		
 	</xsl:template>