fix query arguments
Merge branch 'release/4.6'