Index: AXimpl/Generator.cls.xml
===================================================================
diff -u -r44486 -r44513
--- AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 44486)
+++ AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 44513)
@@ -120,7 +120,9 @@
 <Implementation><![CDATA[
 	Set SubjectId = $replace(SubjectId,"|","")
 	If $$$Contains(SubjectId,","){
-		Set SubjectId = "Multiple subjects"
+		#dim AantalSubjectsNaEerste As %Integer = ##class(TECH.StringUtils).Occurrences(SubjectId,",")
+		#dim EersteSubject As %String = ##class(TECH.StringUtils).GetFirstPart(SubjectId,",")
+		Set SubjectId = EersteSubject_" en "_AantalSubjectsNaEerste_" andere"
 	}
 	Quit SubjectId
 ]]></Implementation>