Index: /WAeUP_SRP/base/skins/waeup_academics/getCosCombinedVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_academics/getCosCombinedVoc.py	(revision 2813)
+++ /WAeUP_SRP/base/skins/waeup_academics/getCosCombinedVoc.py	(revision 2814)
@@ -1,3 +1,3 @@
-##parameters=key=None 
+##parameters=key=None
 # $Id$
 """
@@ -10,5 +10,6 @@
         l += (k,v),
     for k,v in context.portal_vocabularies.cos_cest.items():
-        l += (k,v),
+        if k:
+            l += (k,v),
     return l
 for voc in (context.portal_vocabularies.cos,
@@ -17,3 +18,3 @@
     if title is not None:
         return title
-return "unknown Course  %s" % key
+return "unknown course  %s" % key
Index: /WAeUP_SRP/uniben/profiles/default/layouts/application_manage.xml
===================================================================
--- /WAeUP_SRP/uniben/profiles/default/layouts/application_manage.xml	(revision 2813)
+++ /WAeUP_SRP/uniben/profiles/default/layouts/application_manage.xml	(revision 2814)
@@ -662,5 +662,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -683,5 +683,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -704,5 +704,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -726,5 +726,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
Index: /WAeUP_SRP/uniben/profiles/default/layouts/import_application.xml
===================================================================
--- /WAeUP_SRP/uniben/profiles/default/layouts/import_application.xml	(revision 2813)
+++ /WAeUP_SRP/uniben/profiles/default/layouts/import_application.xml	(revision 2814)
@@ -569,5 +569,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -589,5 +589,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -609,5 +609,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -629,5 +629,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
