Fixed lack of url encoding