small corrections, remove Singleton ability from Query object