Fix the Multi-Entity Fetching System