Fix template audience #4

Open
web_55 wants to merge 2 commits from fix__template-audience into master
pull from: fix__template-audience
2 Commits