_id->id fixes