Updating Handlebars workaround to not output undefined