Parser tweaks
Query projector tests and fixes