entity bookmark bug fixed