correcting handleing of organisation nodes