Fixed Upload and URL handling