Fix pre-query for limited eager fetch