Bugfix on url containing special characters