Stefan,The way we do the macro tables update is not optimal and I think time consuming. I've cleaned up child document handling now except for everything macro related. I believe you can do all this stuff in updateLabels(), please have a look.
Abdel.
