changes general class reports

changes general class reports

modify query for elements correct