KRACOEUS-7970 performance/lock up fix for multiselect
Merge pull request #768 from bsmith83/KRACOEUS-7970

KRACOEUS-7970 performance/lock up fix for multiselect