Checkpoint new `Query` class. [ci skip]
Clean up `Query`.
Merging the `Query` interpolator.