update for new layers and fixes for TOC issue