More bug fixes to URL reformat