Make annotation saving and revising robust.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
Fix user workflow.

Moving to next task was broken after latest changes.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>