[Backport 2.x] Capture information for additional query types and aggregations types

[Backport 2.x] Capture information for additional query types and aggregations types #22604