Fix object search depending on embeded object