Thanks - sounds good! Yeah, the whole thing is a bit complex to work with taking double compilation into account. I think it works all right now, although it's a lot of extra watchers on the page, but the node names will be cached at least