various fix
use templating service
Merge branch 'develop'