diff --git a/xml/queries.xml b/xml/queries.xml
index 1f53a882e..5b8ca4e04 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -406,9 +406,13 @@
 
    <!-- SAP MaxDB -->
    <dbms value="SAP MaxDB">
-       <inference/>
-       <timedelay/>
-       <banner query="SELECT ID FROM SYSINFO.VERSION"/>
+        <length query="LENGTH(%s)"/>
+        <inference query="AND NUM(SUBSTR((%s), %d, 1)) > %d"/>
+        <timedelay/>
+        <banner query="SELECT ID FROM SYSINFO.VERSION"/>
+        <isnull query="%s IS NULL"/>
+        <comment query="--"/>
+        <count query="COUNT(%s)"/>
    </dbms>
 
 </root>