Tidied up URI:s