corrective and preventive queries added
merged with the latest updates