Tagged auto-correction