made queries objecta base class, and other queries as subclasses
merged conflicts