Add a check that a toc entry actually exists before adding it. Added DISIS and Gem entries back to the toc.