[FIX] Parent entity id mismatch between its descendants