diff --git a/xml/banner/postgresql.xml b/xml/banner/postgresql.xml
index 39eb87cc8..5fb42fc16 100644
--- a/xml/banner/postgresql.xml
+++ b/xml/banner/postgresql.xml
@@ -5,6 +5,11 @@
         <info dbms_version="1"/>
     </regexp>
 
+    <!-- Windows -->
+    <regexp value="Visual C\+\+">
+        <info type="Windows"/>
+    </regexp>
+
     <!-- Ubuntu -->
     <regexp value="PostgreSQL\s+(8\.2\.7)\s+on\s+.*?\s+\(Ubuntu 4\.2\.3-2ubuntu4\)">
         <info dbms_version="1" type="Linux" distrib="Ubuntu" release="8.04" codename="Hardy Heron"/>
diff --git a/xml/queries.xml b/xml/queries.xml
index e1d536e39..2bf7fd288 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -169,9 +169,9 @@
         <isnull query="ISNULL(%s, ' ')"/>
         <delimiter query="+"/>
         <limit query="SELECT TOP %d "/>
-        <limitregexp query="SELECT\s+TOP\s+1\s+.+?\s+FROM\s+.+?\s+WHERE\s+.+?\s+NOT\s+IN\s+\(SELECT\s+TOP\s+[\d]+\s+"/>
-        <limitgroupstart/>
-        <limitgroupstop/>
+        <limitregexp query="SELECT\s+TOP\s+([\d]+)\s+.+?\s+FROM\s+.+?\s+WHERE\s+.+?\s+NOT\s+IN\s+\(SELECT\s+TOP\s+([\d]+)\s+"/>
+        <limitgroupstart query="2"/>
+        <limitgroupstop query="1"/>
         <limitstring/>
         <order query="ORDER BY %s ASC"/>
         <count query="COUNT(%s)"/>