Use url generator everywhere
Merge pull request #387 from romainneutron/url-generator

[3.8] Use url generator