Improve Query

Merged Jose Luis Zanotti requested to merge T6013 into 12.0

Merge request reports