Query improvements #4157

Job	Run time
typecheck / typecheck	6m 20s
e2e / 🧪 CLI v3 tests (windows-latest - pnpm)	4m 49s
e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)	1m 50s
e2e / 🧪 CLI v3 tests (windows-latest - npm)	3m 28s
units / internal / 🧪 Unit Tests: Internal (5, 8)	4m 17s
units / packages / 🧪 Unit Tests: Packages (1, 1)	8m 28s
e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)	1m 47s
units / webapp / 🧪 Unit Tests: Webapp (8, 8)	3m 9s
units / internal / 🧪 Unit Tests: Internal (7, 8)	5m 21s
units / webapp / 🧪 Unit Tests: Webapp (6, 8)	4m 2s
units / internal / 🧪 Unit Tests: Internal (6, 8)	4m 29s
units / webapp / 🧪 Unit Tests: Webapp (7, 8)	6m 2s
units / webapp / 🧪 Unit Tests: Webapp (4, 8)	3m 31s
units / webapp / 🧪 Unit Tests: Webapp (5, 8)	7m 21s
units / internal / 🧪 Unit Tests: Internal (3, 8)	6m 23s
units / internal / 🧪 Unit Tests: Internal (4, 8)	5m 46s
units / internal / 🧪 Unit Tests: Internal (2, 8)	9m 43s
units / internal / 🧪 Unit Tests: Internal (8, 8)	3m 21s
units / webapp / 🧪 Unit Tests: Webapp (3, 8)	6m 43s
units / internal / 🧪 Unit Tests: Internal (1, 8)	5m 30s
units / webapp / 🧪 Unit Tests: Webapp (1, 8)	6m 15s
units / webapp / 🧪 Unit Tests: Webapp (2, 8)	4m 14s
units / webapp / 📊 Merge Reports	47s
units / packages / 📊 Merge Reports	20s
units / internal / 📊 Merge Reports	21s
	1h 54m 17s

Provide feedback