Update for URI sanitizing