Fix for updated website + move URL service to main