Improve url prefetch

Should work in more cenarios
Track item creation improved