Fixed feedback bug and a bug when updating annotations