[FSTORE-1714] Query Construction Problem #1373

Job	Run time
Lint and Stylecheck	19s
Unit Tests (Pandas 1.x)	2m 13s
Unit Tests (No Optional Dependencies)	2m 16s
Unit Tests (Local TZ)	3m 16s
Unit Tests (3.8)	2m 41s
Unit Tests (Typechecked)	1m 17s
Unit Tests (3.9)	2m 53s
Unit Tests (Windows)	9m 18s
Unit Tests (Windows) (Local TZ)	11m 22s
Unit Tests (3.10)	2m 58s
	38m 33s

Provide feedback