--- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/XhtmlFormatter.java	Tue Jan 07 21:53:24 2014 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/XhtmlFormatter.java	Tue Jan 07 21:54:59 2014 +0100
@@ -46,6 +46,7 @@
 	public static final String NAME = "xhtml"; // bash-completion:formatter
 	private static final String DOCTYPE = "html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN\" \"http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd\"";
 	private static final String CSS_FILE = "info/globalcode/sql/dk/formatter/XhtmlFormatter.css";
+	private int statementCounter = 0;
 	private int resultSetCounter = 0;
 	private int updatesResultCounter = 0;
 
@@ -115,7 +116,6 @@
 	@Override
 	public void writeQuery(String sql) {
 		super.writeQuery(sql);
-		printTextElement(qname("h3"), null, "SQL:");
 		printTextElement(qname("pre"), null, sql);
 	}
 
@@ -199,9 +199,11 @@
 	}
 
 	@Override
-	public void writeColumnsHeader(ColumnsHeader header) {
-		super.writeColumnsHeader(header);
-		printTextElement(qname("h3"), null, "Data:");
+	public void writeStartResultSet(ColumnsHeader header) {
+		super.writeStartResultSet(header);
+		resultSetCounter++;
+		printEmptyElement(qname("hr"), null);
+		printTextElement(qname("h3"), null, "Result set #" + resultSetCounter);
 		printStartElement(qname("table"));
 		printStartElement(qname("thead"));
 		printStartElement(qname("tr"));
@@ -216,6 +218,14 @@
 	}
 
 	@Override
+	public void writeEndResultSet() {
+		super.writeEndResultSet();
+		printEndElement();
+		printEndElement();
+		printTextElement(qname("p"), null, "Record count: " + getCurrentRowCount());
+	}
+
+	@Override
 	public void writeStartRow() {
 		super.writeStartRow();
 		printStartElement(qname("tr"));
@@ -234,33 +244,21 @@
 	}
 
 	@Override
-	public void writeStartResultSet() {
-		super.writeStartResultSet();
-		resultSetCounter++;
+	public void writeStartStatement() {
+		super.writeStartStatement();
+		statementCounter++;
 		printEmptyElement(qname("hr"), null);
-		printTextElement(qname("h2"), null, "Result set #" + resultSetCounter);
+		printTextElement(qname("h2"), null, "SQL statement #" + statementCounter);
+		resultSetCounter = 0;
+		updatesResultCounter = 0;
 	}
 
 	@Override
-	public void writeEndResultSet() {
-		super.writeEndResultSet();
-		printEndElement();
-		printEndElement();
-
-		printTextElement(qname("p"), null, "Record count: " + getCurrentRowCount());
-	}
-
-	@Override
-	public void writeStartUpdatesResult() {
-		super.writeStartUpdatesResult();
+	public void writeUpdatesResult(int updatedRowsCount) {
+		super.writeUpdatesResult(updatedRowsCount);
 		updatesResultCounter++;
 		printEmptyElement(qname("hr"), null);
-		printTextElement(qname("h2"), null, "Updates result #" + updatesResultCounter);
-	}
-
-	@Override
-	public void writeUpdatedRowsCount(int updatedRowsCount) {
-		super.writeUpdatedRowsCount(updatedRowsCount);
+		printTextElement(qname("h3"), null, "Updates result #" + updatesResultCounter);
 		printTextElement(qname("p"), null, "Updated rows: " + updatedRowsCount);
 	}
 }