Changed device selection rules to be less specific.