Query improvements #4182

Job	Run time
e2e / 🧪 CLI v3 tests (windows-latest - npm)	3m 36s
units / packages / 🧪 Unit Tests: Packages (1, 1)	8m 10s
e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)	1m 43s
typecheck / typecheck	5m 28s
e2e / 🧪 CLI v3 tests (windows-latest - pnpm)	3m 53s
e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)	1m 49s
units / internal / 🧪 Unit Tests: Internal (4, 8)	5m 7s
units / internal / 🧪 Unit Tests: Internal (8, 8)	2m 55s
units / webapp / 🧪 Unit Tests: Webapp (1, 8)	6m 0s
units / internal / 🧪 Unit Tests: Internal (5, 8)	3m 51s
units / internal / 🧪 Unit Tests: Internal (7, 8)	5m 12s
units / internal / 🧪 Unit Tests: Internal (2, 8)	9m 54s
units / internal / 🧪 Unit Tests: Internal (1, 8)	5m 37s
units / webapp / 🧪 Unit Tests: Webapp (7, 8)	5m 44s
units / webapp / 🧪 Unit Tests: Webapp (3, 8)	5m 42s
units / webapp / 🧪 Unit Tests: Webapp (4, 8)	3m 24s
units / internal / 🧪 Unit Tests: Internal (6, 8)	4m 32s
units / webapp / 🧪 Unit Tests: Webapp (2, 8)	4m 12s
units / webapp / 🧪 Unit Tests: Webapp (5, 8)	7m 19s
units / webapp / 🧪 Unit Tests: Webapp (6, 8)	3m 44s
units / internal / 🧪 Unit Tests: Internal (3, 8)	6m 4s
units / webapp / 🧪 Unit Tests: Webapp (8, 8)	2m 40s
units / webapp / 📊 Merge Reports	44s
units / packages / 📊 Merge Reports	25s
units / internal / 📊 Merge Reports	27s
	1h 48m 12s

Provide feedback