[WIP] Query constructor API changes

I can't escape thinking filter means "projection"...
Call it qcriteria instead?