With the new flow $uri is not escaped yet.