Query & Collection Header Simplified

Suggestion for improvement for query and Collection. It would be good if we have hide button so the title is not suppressed when I make the block narrower.