Fix conditions for keeping user selection