add original id to a few more places