Fixing enquiry bugs