fix url encoding
merge