Fixing container lookup on embedded related data data