Fix adding shapes and annotations inside batch_update()

Fix adding shapes and annotations inside batch_update() #432