[FSTORE-1714] Query Construction Problem #1375

Job	Run time
Lint and Stylecheck	11s
Unit Tests (No Optional Dependencies)	2m 24s
Unit Tests (3.8)	2m 41s
Unit Tests (3.9)	2m 48s
Unit Tests (3.10)	2m 57s
Unit Tests (Local TZ)	3m 15s
Unit Tests (Pandas 1.x)	2m 11s
Unit Tests (Typechecked)	1m 17s
Unit Tests (Windows)	10m 10s
Unit Tests (Windows) (Local TZ)	13m 11s
	41m 5s

Provide feedback