further fix for failing entities without ids