some fixes to url