Separate auto-completion from answer type