Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 10183)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 10184)
@@ -91,7 +91,4 @@
 
     def getValues(self, context):
-        # appliction category not available when certificate was deleted.
-        # shouldn't that info be part of applicant info instead?
-        # when we cannot determine the appcat, we will display all courses.
         appcat = getattr(getattr(context, '__parent__', None),
                          'application_category', None)
@@ -99,10 +96,9 @@
         result = catalog.searchResults(
             application_category=(appcat,appcat))
-        result = sorted(result, key=lambda value: value.code)
-        # XXX: What does the following mean here?
+        result = getUtility(
+            IApplicantsUtils).filterCertificates(result)
         curr_course = context.course1
         if curr_course is not None and curr_course not in result:
-            # display also current course even if it is not catalogued
-            # (any more)
+            # display also current course even if certificate has been removed
             result = [curr_course,] + result
         return result
@@ -153,5 +149,17 @@
     """
 
-    APP_TYPES_DICT = Attribute(' dict of application types')
+    APP_TYPES_DICT = Attribute('dict of application types')
+
+    def setPaymentDetails(container, payment):
+        """Set the payment data of an applicant.
+        """
+
+    def getApplicantsStatistics(container):
+        """Count applicants in containers.
+        """
+
+    def filterCertificates(resultset):
+        """Filter and sort certificates for AppCatCertificateSource.
+        """
 
 class IApplicantsRoot(IKofaObject, IContainer):
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py	(revision 10183)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py	(revision 10184)
@@ -63,4 +63,6 @@
 
     def getApplicantsStatistics(self, container):
+        """Count applicants in containers.
+        """
         state_stats = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
             ADMITTED:0, NOT_ADMITTED:0, CREATED:0}
@@ -75,2 +77,7 @@
                 applicant_id=(code, mxcode)))
         return state_stats, None
+
+    def filterCertificates(self, resultset):
+        """Filter and sort certificates for AppCatCertificateSource.
+        """
+        return sorted(resultset, key=lambda value: value.code)
