Re #940 - replacing hardcoded urls with url service