added proper url encoding