Index: TECH/Algo/SQL/QueryEngine/CombinatieConditie.cls.xml
===================================================================
diff -u -r9 -r947
--- TECH/Algo/SQL/QueryEngine/CombinatieConditie.cls.xml	(.../CombinatieConditie.cls.xml)	(revision 9)
+++ TECH/Algo/SQL/QueryEngine/CombinatieConditie.cls.xml	(.../CombinatieConditie.cls.xml)	(revision 947)
@@ -36,15 +36,14 @@
 <Method name="MaakConditieString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Conditie = ""
+	#dim Conditie As %String = ""
 	Set SubconditiesIterator = ##class(TECH.ListIterator).%New(..Subcondities)
-	While (SubconditiesIterator.HasNext())
-	{
-		Set Subconditie = SubconditiesIterator.Next()
+	While (SubconditiesIterator.HasNext()) {
+		#dim Subconditie As %String = SubconditiesIterator.Next()
 		Set Conditie = Conditie_Subconditie.MaakConditieString()
 		If (SubconditiesIterator.HasNext()) { Set Conditie = Conditie_" "_..CombinatieConditieOperator_" " }
 	}
-	Quit "("_Conditie_")"
+	Quit $select(..Subcondities.Count()>1:"("_Conditie_")",1:Conditie)
 ]]></Implementation>
 </Method>
 
@@ -62,7 +61,13 @@
 
 <Method name="HeeftConditie">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..Subcondities.Size > 0
+<Implementation><![CDATA[
+	#dim HeeftConditie As %Boolean = 0 
+	#dim KindIterator As TECH.Iterator = ..GeefKindIterator()
+	while KindIterator.HasNext() {
+		set HeeftConditie = HeeftConditie + KindIterator.Next().HeeftConditie()
+	}
+	Quit HeeftConditie
 ]]></Implementation>
 </Method>
 </Class>