Currently, every time when you select an object for embedding via UDW internal XML stores it's contentId instead of locationId. It causes issues with changing location visibility not being reflected in the editor and also might cause different issues in a multisite configuration.