Fixing URL encoding issues