Tagged restoration-and-repair