Fixed URL encoding issues