Revert "Changed case for 2 arguments in query function"

This reverts commit 44db31d3895dbccab30ac1e0384ed63058aa1650.
Reverting previous commit (applied in develop branch instead)
Merge branch 'develop'
fixing upgrade bugs
upgrade fixes
OMG