Fix URL generation.
Work on URL generation.