refactor and fix manifest to match both type of TOC urls