draft: add bookmark assist
bug fix