Fixed: prevent invalid node ids (with prefix '_')