Bugfix: Issue with api endpoint when baseUrl is set