fixing current matches handlebars