* Update TODO list with further escaping needs