generate uri improvements