Use urllib.quote to handle special characters better