Merge change 1287

* changes:
  When adding a bookmark, use the same database entry as the history item.