--- a/web/views/editforms.py	Mon Mar 23 18:20:23 2009 +0100
+++ b/web/views/editforms.py	Mon Mar 23 18:53:53 2009 +0100
@@ -102,8 +102,8 @@
     def __init__(self, *args, **kwargs):
         super(AutomaticEntityForm, self).__init__(*args, **kwargs)
         self.entity.complete()
-        for rschema, target in self.editable_attributes(entity):
-            field = guess_field(entity.__class__, entity.e_schema, rschema, target)
+        for rschema, target in self.editable_attributes(self.entity):
+            field = guess_field(entity.__class__, self.entity.e_schema, rschema, target)
             self.fields.append(field)
             
     def form_buttons(self):

--- a/web/views/tabs.py	Mon Mar 23 18:20:23 2009 +0100
+++ b/web/views/tabs.py	Mon Mar 23 18:53:53 2009 +0100
@@ -12,7 +12,7 @@
 from cubicweb import NoSelectableObject, role
 from cubicweb.selectors import partial_has_related_entities
 from cubicweb.view import EntityView
-from cubicweb.common import tags
+from cubicweb.common import tags, uilib
 
 
 class LazyViewMixin(object):
@@ -42,7 +42,7 @@
         if rql:
             urlparams['rql'] = rql
         elif eid:
-            urlparams['rql'] = rql_for_eid(eid)
+            urlparams['rql'] = uilib.rql_for_eid(eid)
         elif rset:
             urlparams['rql'] = rset.printable_rql()
         w(u'<div id="lazy-%s" cubicweb:loadurl="%s">' % (

--- a/web/views/xmlrss.py	Mon Mar 23 18:20:23 2009 +0100
+++ b/web/views/xmlrss.py	Mon Mar 23 18:53:53 2009 +0100
@@ -139,7 +139,7 @@
             return
         urlgetter = self.vreg.select_component('rss_feed_url', self.req, self.rset)
         url = urlgetter.feed_url()
-        self.w(u'<a href="%s"><img src="%s" alt="rss"/></a>\n' % (html_escape(url), rss))
+        self.w(u'<a href="%s"><img src="%s" alt="rss"/></a>\n' % (xml_escape(url), rss))
 
 
 class RssView(XmlView):