Fixes to object targeting in handlebars template