Fix URL generation.
Work on URL generation.
Merge branch '4.1'