Fixed URI escape problem