Revert "query2 1st attempt"

This reverts commit 97f6f6d5e1b3d95af30eb9142cf015324abaaf7e.
query3 completed