NAE fix
Bookmark crash fix