tweaked bookmark handling