createSingletonNode now ensures found nodes are in the correct container