PDI-10342 fix for flawed list selection,
Merge pull request #382 from gretchiemoran/master

PDI-10342 fix for flawed list selection,