ADDED url encoding