[#1875] Adding more fields to enquiry (DO NOT MERGE)