Update link handling for return links