minor fix
fixed conflict
fixe in query.py
fixed conflict
Merge pull request #1603 from nabinhait/v4-hotfix

fixes