Added various minor fixes to enquiries