DDF-693 removed unnecessary handlebars loop through types