handlebars: fix after review