bugfix: update conditions to handle the rootNode ID fix correctly