Fix: Exchange entry and service URL