Fixed auto-tagging.