Fixing issues getting context for a bookmark