Address TODOs in TachyonURI