Fixed handling of special characters in URL