Index: web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java	(revision 5845)
+++ web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java	(working copy)
@@ -316,8 +316,10 @@
         if ((feedurl !=null)&&(!feedurl.trim().equals(""))) {
             wheresql += " and feedentry.feedurl='" + feedurl.replaceAll("'","''") + "'";
         } else if ((filterStatus.getGroup() !=null)&&(!filterStatus.getGroup().trim().equals(""))) {
-            wheresql += " and feedentry.feedurl in ("
-                    + "select feed.url from XWiki.AggregatorURLClass as feed where '" + filterStatus.getGroup().replaceAll("'","''") + "' in elements(feed.group))";
+            wheresql += "and feedentry.feedurl in (" 
+                + "select feed.url from XWiki.AggregatorURLClass as feed, BaseObject as obj, " 
+                + "XWiki.AggregatorGroupClass as groupProp where obj.name in elements(feed.group) " 
+                + "and obj.id = groupProp.id and groupProp.name='" + filterStatus.getGroup().replaceAll("'", "''") + "')";            
         }
 
         if (filterStatus.getDate() !=null) {
