Some more changes in enquiry Module.