Issue #20464:fix multiple query problems
Merge pull request #56 from garyhgohoos/20464

Issue #20464:fix multiple query problems