Refs #8140 Updated DataSelector with suggested changes.