Again fix url encode