Bug 1026426 — Handle short URLs

we don't want to store this inside the payload.