Bug 5209: Fix EID string in URLs