More robust external users search parameters (Dec 2024)