Fixd duplicated entity annotation