Index: vhLib/System.mac.rou
===================================================================
diff -u -r375 -r486
--- vhLib/System.mac.rou	(.../System.mac.rou)	(revision 375)
+++ vhLib/System.mac.rou	(.../System.mac.rou)	(revision 486)
@@ -32,7 +32,7 @@
 GetJobInfo(blnMultiLine,Indent)
 	Set Indent=$G(Indent),blnMultiLine=$G(blnMultiLine,1)
  	Set Txt=Indent_"Device: "_$I_"  Job: "_$J
-	Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"Server: "_$$$Server_"  NameSpace: "_$$$NSpace_$S(blnMultiLine:$$$CRLF, 1:"")
+	Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"Server: "_##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()_"  NameSpace: "_$$$NSpace_$S(blnMultiLine:$$$CRLF, 1:"")
 	Quit Txt
 	
 GetStackToString(Short,NoLastLevels)
@@ -50,5 +50,5 @@
  ..  Set Body=Body_$$$CRLF_"   - Context type  : "_$STACK(loop)
  ..  Set Body=Body_$$$CRLF_"   - Current place : "_$STACK(loop,"PLACE")
  ..  Set Body=Body_$$$CRLF_"   - Current source: "_$STACK(loop,"MCODE")
- Set Body=Body_$$$CRLF_$$$CRLF_"Server: "_##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()_" NameSpace: "_$ZU(5)
+ Set Body=Body_$$$CRLF_$$$CRLF_$$GetJobInfo(1,"")
  Quit Body