Bug 21385: (follow-up) make query consistent