improved bookmark functionality