--- a/app/soc/views/helper/templatetags/forms_helpers.py	Sat Apr 11 22:57:23 2009 +0000
+++ b/app/soc/views/helper/templatetags/forms_helpers.py	Sat Apr 11 22:58:19 2009 +0000
@@ -329,11 +329,11 @@
         args[filter_field] = getattr(entity, filter_field)
 
       if '__scoped__' in filter:
-        args['scope_path'] = entity.key().name()
+        args['scope_path'] = entity.key().id_or_name()
 
       # TODO: replace this hack needed to get org-scoped mentor autocompletion on student proposals
       if '__org__' in filter:
-        args['scope_path'] = entity.org.key().name()
+        args['scope_path'] = entity.org.key().id_or_name()
 
       params['args'] = '&'.join(['%s=%s' % item for item in args.iteritems()])