Changed PhraseAnnotator and QuestionPhraseAnnotator noun phrase criteria