createSingletonNode now ensures found nodes are in the correct container
fix edge case in singleton node creation