[FIX] query

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

Merge request reports