Reorder 'Query.__init__' paramters to match Entity.