Progress, but still a problem with URL encoding AWS style