[WIP] Query constructor API changes

The query should always be wrapped in a $query.... the fact older versions of mongodb allow to omit that has been a long outstanding pain of the server team.. so lets not extend their sufferings anymore :)