better bookmarking support