More bug fixes to URL reformats