various fix
use templating service