Limited eager-fetch pre-query should handle sorts