Optimize links tracking and repairing