Fixed query class