Bugfix when using baseUrl & uri

url was not constructed correctly
Revert "Bugfix when using baseUrl & uri"

This reverts commit 79062bfb843fbb335a73e62a0844013525ee4b6e.
Revert "Revert "Bugfix when using baseUrl & uri""

This reverts commit 625bfd0fd53987fce63cd55166f74251735b3250.