Changing the template to avoid crash in account of changed field names