Dual version entity ID rewriting