[FIX] Query BUG

Merged Julián Corso requested to merge fix_query_bug into 11.0-stage

Merge request reports