Annotator - fix @id references and optimize batch retrieval process