Fixed Firebase batch loading