Revamp --query #1873

Job	Run time
fmt	8s
clippy (macos-latest)	27s
clippy (ubuntu-latest)	1m 38s
clippy (windows-latest)	1m 27s
coverage-unit (ubuntu-latest)	2m 51s
test (ubuntu-latest)	1m 47s
test (macos-latest)	40s
coverage-unit (windows-latest)	4m 11s
coverage-unit (macos-latest)	57s
test-minimal-container	2m 16s
coverage-integration (macos-latest)	2m 21s
coverage-integration (ubuntu-latest)	5m 43s
upload-coverage	3s
	24m 29s

Provide feedback