diff --git a/lib/request/inject.py b/lib/request/inject.py
index 2a4d41d4e..c02cc150a 100644
--- a/lib/request/inject.py
+++ b/lib/request/inject.py
@@ -85,9 +85,9 @@ def __goInferenceFields(expression, expressionFields, expressionFieldsList, payl
             expression = agent.limitQuery(num, expression, field)
 
         if "ROWNUM" in expressionFieldsList:
-            expressionReplaced = expression.replace(expressionFields, field, 1)
-        else:
             expressionReplaced = expression
+        else:
+            expressionReplaced = expression.replace(expressionFields, field, 1)
 
         output = resume(expressionReplaced, payload)
 
diff --git a/xml/queries.xml b/xml/queries.xml
index 0b746e8e7..bd09a4735 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -131,7 +131,7 @@
         <banner query="VERSION()"/>
         <current_user query="CURRENT_USER"/>
         <current_db query="CURRENT_DATABASE()"/>
-        <is_dba query="(SELECT usesuper=true FROM pg_user WHERE usename=CURRENT_USER OFFSET 0 LIMIT 1)='true'"/>
+        <is_dba query="(SELECT usesuper=true FROM pg_user WHERE usename=CURRENT_USER OFFSET 0 LIMIT 1)"/>
         <users>
             <inband query="SELECT usename FROM pg_user"/>
             <blind query="SELECT DISTINCT(usename) FROM pg_user OFFSET %d LIMIT 1" count="SELECT COUNT(DISTINCT(usename)) FROM pg_user"/>