QuestionTypes Focus: Add a token feature
FocusNameProxy: New annotator that adds another Focus in case just 'name' was a focus before