Completed adding full support for ParentTabID to all templates