Can we move this logic in  `fields.html`?