Merge pull request #15574 from Zlash65/min-min

[Minor] Query fix