hotfix query class