Index: Tools/GlobalSearch.cls.xml
===================================================================
diff -u -r1445 -r1596
--- Tools/GlobalSearch.cls.xml	(.../GlobalSearch.cls.xml)	(revision 1445)
+++ Tools/GlobalSearch.cls.xml	(.../GlobalSearch.cls.xml)	(revision 1596)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="Tools.GlobalSearch">
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Property name="Result">
 <Type>%String</Type>
@@ -51,13 +51,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefListbasedGlobals">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ##class(TECH.ListbuildIterator).%New($LB("^TECH.PubSub.EventSubscriptionD"))
+]]></Implementation>
+</Method>
+
 <Method name="FindInGlobals">
 <FormalSpec>Value:%String,Globals:%List=""</FormalSpec>
 <Implementation><![CDATA[
 	do ..Reset()
 	#dim Counter As %Integer 
-	if '$length(Globals) set Globals = ..GeefDefaultGlobals()
+	if '$length(Globals) {
+		set Globals = ..GeefDefaultGlobals()
+	}
 	For Counter=1:1:$listlength(Globals) Do ..FindInGlobal(Value,$listget(Globals,Counter))
+	#dim ListbasedGlobalIterator As TECH.Iterator = ..GeefListbasedGlobals()
+	while ListbasedGlobalIterator.HasNext() {
+		#define ListBased 1
+		do ..FindInGlobal(Value,ListbasedGlobalIterator.Next(),$$$ListBased)
+	}
+	
+	;For Counter=1:1:$listlength(Globals) Do ..FindInGlobal(Value,$listget(Globals,Counter))
+	
 	write "# Global nodes gevonden : "_..RecordsFound,!
 	if ..RecordsFound { 
 		write "File  : ",..Bestandsnaam 
@@ -116,7 +133,7 @@
 </Method>
 
 <Method name="FindInGlobal">
-<FormalSpec>Value:%String,Global:%String</FormalSpec>
+<FormalSpec>Value:%String,Global:%String,Listbased:%Boolean=0</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim FromNode As %String = Global
@@ -129,10 +146,10 @@
 	For  Set Node=$query(@Node) Quit:Node=""  Quit:ToNode["("&($E(Node,1,$L(ToNode)-1)'=$E(ToNode,1,$L(ToNode)-1))  Do
 	. Quit:'$D(@Node)#10
 	. Set Record = @Node
-	. Quit:Record'[Value
+	. Quit:$select(Listbased:'$listfind(Record,Value),1:Record'[Value)
 	. set ..RecordsFound = ..RecordsFound + 1
 	. do ..Result.Insert(Node)
-	. do ..Result.Insert(Record)
+	. do ..Result.Insert($select(Listbased:$$$LCVT(Record),1:Record))
 	. do ..Result.Insert("")
 ]]></Implementation>
 </Method>