--- a/dataimport.py	Mon Feb 03 16:30:07 2014 +0100
+++ b/dataimport.py	Mon Feb 17 15:32:50 2014 +0100
@@ -873,7 +873,7 @@
         return getattr(self, 'gen_%s' % rtype)(entity)
 
     def gen_cwuri(self, entity):
-        return u'%seid/%s' % (self.baseurl, entity.eid)
+        return u'%s%s' % (self.baseurl, entity.eid)
 
     def gen_creation_date(self, entity):
         return self.time
@@ -1115,9 +1115,9 @@
     def _handle_source_relation_sql(self, session, sql, attrs):
         self._append_to_entities(sql, attrs)
 
-    # XXX add_info is similar to the one in NativeSQLSource. It is rewritten
-    # here to correctly used the _handle_xxx of the SQLGenSourceWrapper. This
-    # part should be rewritten in a more clearly way.
+    # add_info is _copypasted_ from the one in NativeSQLSource. We want it
+    # there because it will use the _handlers of the SQLGenSourceWrapper, which
+    # are not like the ones in the native source.
     def add_info(self, session, entity, source, extid, complete):
         """add type and source info for an eid into the system table"""
         # begin by inserting eid/type/source/extid into the entities table