Fix to url encoding