Refs #16751 EEA; improve filtering wrong versionIds