[Bookmark] Fixed some issues.

* [NABI-RSA] TDIS-7050, TDIS-7230
Merge pull request #339 from LuffyWang/next

[Bookmark] Fixed some issues.