Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py	(revision 6120)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py	(revision 6121)
@@ -24,4 +24,7 @@
 """
 import grok
+from hurry.query import Eq
+from hurry.query.interfaces import IQuery
+from zope.component import getUtility
 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
 from waeup.sirp.accesscodes import get_access_code
@@ -97,11 +100,15 @@
     ``APP`` or ``PUDE``, ``XXX`` the access code series and
     ``YYYYYYYYYY`` the real accesscode number.
+
+    This function requires a fully blown setup as it does catalog
+    lookups for finding applicants.
     """
-    site = grok.getSite()
-    for container in site['applicants'].values():
-        applicant_data = container.get(identifier, None)
-        if applicant_data is not None:
-            return applicant_data
-    return None
+    query = getUtility(IQuery)
+    results = list(query.searchResults(
+            Eq(('applicants_catalog', 'access_code'), identifier)
+            ))
+    if len(results) == 0:
+        return None
+    return results[0]
 
 def application_exists(identifier):
