fixed handlebars templates