[5.x] Run query scopes after all other query methods so the query can be changed

[5.x] Run query scopes after all other query methods so the query can be changed #6795