Fix: check protocol & port number to be included in URL for non-standard ports (v2)