discovery_requests improvement