Fix bookmarking functions