fixed issues with url encoding