Fix bookmarks depending on embeded object and move checking if the