aligned js templating with new schema