template error + added custom fields