issue #21605: Second pass getting pre-requisite check to work on multi-select.