Re #940 - API fully using URL service