@machabamachaba - Refactored fields for Enquiry