GEP-23 Added support for fields to confirmation page