improved query class