Modify Enquiry with some issues