Index: BL/Derde/Agenda/Agenda.cls.xml
===================================================================
diff -u -r1133 -r2191
--- BL/Derde/Agenda/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 1133)
+++ BL/Derde/Agenda/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2191)
@@ -976,13 +976,12 @@
 <Type>%SQLQuery</Type>
 <FormalSpec>UserID:%Integer,Datum:%Date,Types:%String</FormalSpec>
 <SqlQuery><![CDATA[	SELECT TijdVan,TijdTot,Type,
-		CASE WHEN ifnull(Klant,0,1)=1 THEN Klant
-		WHEN ifnull(Leverancier,0,1)=1 THEN Leverancier
-		ELSE ""
-		END as DerdeID,
-		CASE WHEN ifnull(Klant,0,1)=1 THEN Klant->Naam
-		WHEN ifnull(Leverancier,0,1)=1 THEN Leverancier->Naam
-		ELSE Prospect
+		COALESCE(Klant,Leverancier,Architect,"") as DerdeID,
+		CASE WHEN Klant is not null THEN Klant->Naam
+		WHEN Leverancier is not null THEN Leverancier->Naam
+		WHEN Prospect is not null THEN Prospect
+		WHEN Architect is not null THEN Architect->Naam
+		WHEN Eindgebruiker is not null THEN Eindgebruiker->Adres_Naam
 		END as Naam,
 		Straat,Gemeente,PostCode,Land->Code as Land,
 		TekstKort,SubID,Afstand