Post-fixed query reduce logic bug.

Expand the previous fix e130e8 onto other places.