Merge pull request #1798 from nabinhait/v4-hotfix

Account common get_query