minor template fixes
cr fix
Merge pull request #7477 from guardian/manual-multi-fixes

Minor manual multiple template fixes