Fix url encoding issue