[WIP] Query constructor API changes

Should there be a catch all here notifying about unsupported options?