--- a/server/sources/pyrorql.py	Tue Oct 26 20:22:08 2010 +0200
+++ b/server/sources/pyrorql.py	Tue Oct 26 20:22:30 2010 +0200
@@ -395,7 +395,7 @@
     def _entity_relations_and_kwargs(self, session, entity):
         relations = []
         kwargs = {'x': self.eid2extid(entity.eid, session)}
-        for key, val in entity.iteritems():
+        for key, val in entity.cw_attr_cache.iteritems():
             relations.append('X %s %%(%s)s' % (key, key))
             kwargs[key] = val
         return relations, kwargs