Issue #2: Fix redirect issue with non empty baseUrl