Add auto-completion for mentor field