Updated Annotator with bugfix agains double-adding orphans upon reanchoring