First step of refactoring

Query class. Just as a first step in refactoring process.
There are some things for you to test :)
Going forward, want to remove Helpers and simplify Query stuff. Many useless things found.