Refactored recovery for nodes with same alias