Thread:Query (8)

Looks good - yes, maybe in the extra panel would be good.