query limitation

(cherry picked from commit 25b5c4638662980a494374cb7343fb12c5894008)