diff -r db09803df8b2 -r 280080eadb22 server/rqlannotation.py
--- a/server/rqlannotation.py	Wed Sep 16 16:35:24 2009 +0200
+++ b/server/rqlannotation.py	Wed Sep 16 16:36:08 2009 +0200
@@ -331,7 +331,7 @@
         if isinstance(term, VariableRef) and self.is_ambiguous(term.variable):
             var = term.variable
             if len(var.stinfo['relations'] - var.stinfo['typerels']) == 1 \
-                   or rel.sqlscope is var.sqlscope:
+                   or rel.sqlscope is var.sqlscope or rel.r_type == 'identity':
                 self.restrict(var, frozenset(etypes_func()))
                 try:
                     self.maydeambrels[var].add(rel)