Issue #21374: Fixed issue with list fetching every time a param is changed in a loop