Better baseUrl default handling