*8845* Affix IDs on export