Fixed URL encoding problems