Patch for double URL encoding bug