Fix bug in annotation/group sync