add support for entity linking... needs improvement