[WIP] Bug 1026426 — Handle short URLs

we should ensure that urlData contains urlId before storing it, to avoid dupes.