Revert "query changes"

This reverts commit e38b1ed3729fd0083c956f30d6cff67686bf819b.