Adapted to use unencode uri