Selection Logic now works.  Not seeing any problems when changing data sets.