More changes related to selected being comparison

See title