[TASK] ADWD-1315 keep position of links