Fixes in Create new enquiry