Fix for buggy URL escaping