Rework on query unit has *seems* completed