Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/export.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/export.py	(revision 7923)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/export.py	(revision 7924)
@@ -73,14 +73,17 @@
 
     #: Fieldnames considered by this exporter
-    fields = tuple(IApplicantBaseData.names())
+    fields = tuple(sorted(IApplicantBaseData.names()))
 
     #: The title under which this exporter will be displayed
     title = _(u'Applicants')
 
-    def NOmangle_value(self, value, name, context=None):
-        if name == 'provider' and isinstance(value, tuple):
-            value = value[0]
+    def mangle_value(self, value, name, context=None):
+        if name in (
+            'course1', 'course2', 'course_admitted') and value is not None:
+            value = value.code
+        elif name == 'school_grades':
+            value = [eval(entry.to_string()) for entry in value]
         return super(
-            ApplicantsContainerExporter, self).mangle_value(
+            ApplicantsExporter, self).mangle_value(
             value, name, context=context)
 
@@ -105,4 +108,6 @@
             return self.export([], filepath)
         applicants = catalog.searchResults(
-            reg_number=(None, None))
+            # reg_num might not be set and then would not be found.
+            # We therefore search for applicant_id.
+            applicant_id=(None, None))
         return self.export(applicants, filepath)
