Fix for Invalid Url Building

Was incorrectly concatenating Url's, we cannot be sure the domain is
formatted perfectly so we handle it more robustly in js.