fix annotations re-loading incorrectly, update Annotation model