fixes for url generator