[WIP] Bug 1026426 — Handle short URLs