DDF-376: Consolidated Query functionality; added threads