[FIX]Query and pretty function

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

Merge request reports