security changes

security changes templating