Changes for bookmark issue