Fixed lack of url encoding issue