Tagged remedial-repair