Added missing query object queries. We should probably add some class magic around that.