lots of changes to url encoding