[#76596764] Uses unique nodes id rather than names