Corrected data-source service url resolution