[WIP] Query constructor API changes

Remind me again.. Why do we have to support object for query modifiers?