Fixing URL encoding issues
Whoops...