Fixed issues with named entities in NLP