Tagged e-repair