- finish query3
- uppercase columns in query1