Index: ccr/trunk/p/C0CMXP.m
===================================================================
--- ccr/trunk/p/C0CMXP.m	(revision 726)
+++ ccr/trunk/p/C0CMXP.m	(revision 727)
@@ -99,4 +99,5 @@
  . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
  D SETXPF(FARY) ;SET FILE VARIABLES
+ I +TEMPID=0 S TEMPID=$$RESTID^C0CSOAP(TEMPID,FARY) ;RESOLVE TEMPLATE NAME
  I $$GET1^DIQ(C0CXPF,TEMPID_",",C0CXTFLD,,OUTXML)'=OUTXML D  Q  ;
  . W "ERROR RETRIEVING TEMPLATE",!
@@ -143,5 +144,6 @@
  . K ZD ;FOR DATA
  . D DATA^C0CMXML("ZD",ZI) ;SEE IF THERE IS DATA FOR THIS NODE
- . I $D(ZD(1)) D  ; IF YES
+ . ;I $D(ZD(1)) D  ; IF YES
+ . I $$FIRST^C0CMXML(ZI)=0 D  ; IF THERE ARE NO CHILDREN TO THIS NODE
  . . ;I ZI<3 B  ;W !,ZD(1)
  . . K @C0CDOM@(ZI,"T") ; KILL THE DATA