Fixing on the ESG queries