Index: src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java
===================================================================
--- src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java	(revision 12580)
+++ src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java	(working copy)
@@ -42,6 +42,7 @@
 import com.xpn.xwiki.monitor.api.MonitorPlugin;
 import com.xpn.xwiki.render.groovy.XWikiGroovyRenderer;
 import com.xpn.xwiki.util.Util;
+import com.xpn.xwiki.web.Utils;
 import com.xpn.xwiki.web.XWikiRequest;
 
 public class DefaultXWikiRenderingEngine implements XWikiRenderingEngine
@@ -278,6 +279,7 @@
                             }
                         }
                     }
+                    content = Utils.replacePlaceholders(content, context);
                 } finally {
                     // Remove including doc or set the previous one
                     if (idoc == null) {
Index: src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java
===================================================================
--- src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java	(revision 12580)
+++ src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java	(working copy)
@@ -444,6 +444,10 @@
         String firstCol = returnCol(sql, true);
         String secondCol = returnCol(sql, false);
 
+        int i1 = sql.lastIndexOf("order by");
+        if (i1!=-1)
+         sql = sql.substring(0, i1);
+
         String newsql = sql.substring(0, sql.indexOf(firstCol));
         newsql += secondCol + " ";
         newsql += sql.substring(sql.indexOf("from"));