Index: query.py
===================================================================
--- query.py	(revision 3046)
+++ query.py	(working copy)
@@ -713,7 +713,8 @@
     if related_query:
         matches = [f for f in field_list if f.field.related_query_name() == name]
     else:
-        matches = [f for f in field_list if f.name == name]
+        matches = [f for f in field_list if f.name == name or 
+                hasattr(f, "related_query_name") and f.related_query_name() == name]
     if len(matches) != 1:
         return None
     return matches[0]