fixed _embedded returns