Bug fixes for incorrect saving of Annotation Sets