Changed BaseUrl behavior to use current scheme and host name