-Fix to close bookmark in certain cases
- Manage bookmark id across invocations