fix template and mappign vars decorating