Make selection make more sense