baseUrl improvement