#1508: Added URLs that mimic more closely the production environment. Added proper URL parsing.