Fix #1070 - .Include() order causes Queries to fail.

- Ensure that collection includes run first so that sub-queries use the original top-level query.