*8648* Fix URL construction when there's already parameters