[FIX]Query return operation

Merged Gastón Bertolani requested to merge 11.0-query into 11.0-stage

Merge request reports