fixed url generation