Fixed scope bug. Need to fix add process
Fixed bookmark addition. Need refactoring