LPS-27530 BookmarksEntry changes for new staging

Hey Julio,

This is the bookmarks entry changes for the new staging. It contains 9 commits, but the commits contain small changes with some explanation in the commit message. Maybe this is easier to review or check.

Can you please review the changes and push it to Brian?

Gracias,

Máté