Data Selector Bug Fixes