URI improvements