Make URL details more robust