Fix bookmark loss after update issue