Fixed most of bookmarking bugs