Change bookmarks loading. Load them into dictionary instead of arrays.