Not using query ids anymore