[Unicue] Improve auto fixing for cue.