Flag auto-correct UX