Fixed URI encoding issue