diff --git a/xml/queries.xml b/xml/queries.xml
index c330a35cb..f1931c56e 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -344,10 +344,10 @@
 
     <!-- Microsoft Access -->
     <dbms value="Microsoft Access">
-        <cast query="CVAR(%s)"/>
-        <length query="LEN(%s)"/>
+        <cast query="RTRIM(CVAR(%s))"/>
+        <length query="LEN(RTRIM(CVAR(%s)))"/>
         <isnull query="IIF(LEN(%s)=0,' ',%s)"/>
-        <delimiter query=","/>
+        <delimiter query="&amp;"/>
         <limit query="TOP %d"/>
         <limitregexp query="\s+TOP\s+([\d]+)"/>
         <limitgroupstart query="1"/>