Move everything to store bookmark under Entry instead of reverse