Generate URL fix