Extract base name from URLs correctly

[farshidz]

• What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

• What is the current behavior? (You can also link to an open issue here)

• What is the new behavior (if this is a feature change)?

• Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

• Have unit tests been run against this PR? (Has there also been any additional testing?)

• Related Python client changes (link commit/PR here)

• Related documentation changes (link commit/PR here)

• Other information:

• Please check if the PR fulfills these requirements

• [ ] The commit message follows our guidelines

• [ ] Tests for the changes have been added (for bug fixes/features)

• [ ] Docs have been added / updated (for bug fixes / features)

[farshidz]

Requires test coverage, or verify there is test coverage