Fixed bug related to empty urls