Updated Public Url builder to use Uri Scheme, Host and PathAndQuery when base URLs are not configured