replica node ID handling

Here the small changes I made